HBASE-4247 Add isAborted method to the Abortable interface

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1172039 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -508,6 +508,8 @@ Release 0.91.0 - Unreleased
                (David Revell)
    HBASE-4424  Provide coprocessors access to createTable() via 
                MasterServices
+   HBASE-4247  Add isAborted method to the Abortable interface
+               (Akash Ashok)
 
   TASKS
    HBASE-3559  Move report of split to master OFF the heartbeat channel

src/main/java/org/apache/hadoop/hbase/Abortable.java

@@ -34,4 +34,10 @@ public interface Abortable {
    * @param e Throwable that caused abort. Can be null.
    */
   public void abort(String why, Throwable e);
+  
+  /**
+   * Check if the server or client was aborted. 
+   * @return true if the server or client was aborted, false otherwise
+   */
+  public boolean isAborted();
 }

src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

@@ -85,6 +85,7 @@ public class HBaseAdmin implements Abortable, Closeable {
   // numRetries is for 'normal' stuff... Mutliply by this factor when
   // want to wait a long time.
   private final int retryLongerMultiplier;
+  private boolean aborted;
   
   /**
    * Constructor
@@ -154,9 +155,15 @@ public class HBaseAdmin implements Abortable, Closeable {
   @Override
   public void abort(String why, Throwable e) {
     // Currently does nothing but throw the passed message and exception
+    this.aborted = true;
     throw new RuntimeException(why, e);
   }
   
+  @Override
+  public boolean isAborted(){
+    return this.aborted;
+  }
+
   /** @return HConnection used by this object. */
   public HConnection getConnection() {
     return connection;

src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

@@ -446,6 +446,7 @@ public class HConnectionManager {
 
     private final Object masterLock = new Object();
     private volatile boolean closed;
+    private volatile boolean aborted;
     private volatile HMasterInterface master;
     private volatile boolean masterChecked;
     // ZooKeeper reference
@@ -1660,9 +1661,15 @@ public class HConnectionManager {
       }
       if (t != null) LOG.fatal(msg, t);
       else LOG.fatal(msg);
+      this.aborted = true;
       this.closed = true;
     }
     
+    @Override
+    public boolean isAborted(){
+      return this.aborted;
+    }
+
     public int getCurrentNrHRS() throws IOException {
       try {
         // We go to zk rather than to master to get count of regions to avoid

src/main/java/org/apache/hadoop/hbase/master/HMaster.java

@@ -1308,7 +1308,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
     return this.stopped;
   }
 
-  boolean isAborted() {
+  public boolean isAborted() {
     return this.abort;
   }
   

src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

@@ -1521,6 +1521,10 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
     abort(reason, null);
   }
 
+  public boolean isAborted() {
+    return this.abortRequested;
+  }
+  
   /*
    * Simulate a kill -9 of this server. Exits w/o closing regions or cleaninup
    * logs but it does close socket in case want to bring up server on old

src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java

@@ -46,6 +46,7 @@ public class ReplicationLogCleaner implements LogCleanerDelegate, Abortable {
   private ReplicationZookeeper zkHelper;
   private Set<String> hlogs = new HashSet<String>();
   private boolean stopped = false;
+  private boolean aborted;
 
   /**
    * Instantiates the cleaner, does nothing more.
@@ -166,6 +167,12 @@ public class ReplicationLogCleaner implements LogCleanerDelegate, Abortable {
   @Override
   public void abort(String why, Throwable e) {
     LOG.warn("Aborting ReplicationLogCleaner because " + why, e);
+    this.aborted = true;
     stop(why);
   }
+
+  @Override
+  public boolean isAborted() {
+    return this.aborted;
+  }
 }

src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java

@@ -365,6 +365,11 @@ public class HBaseFsck {
           LOG.error(why, e);
           System.exit(1);
         }
+        @Override
+        public boolean isAborted(){
+          return false;
+        }
+        
       });
     rootRegionTracker.start();
     ServerName sn = null;

src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java

@@ -395,4 +395,9 @@ public class ZooKeeperWatcher implements Watcher, Abortable {
   public void abort(String why, Throwable e) {
     this.abortable.abort(why, e);
   }
+  
+  @Override
+  public boolean isAborted() {
+    return this.abortable.isAborted();
+  }
 }

src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java

@@ -82,6 +82,11 @@ public class TestCatalogTracker {
       public void abort(String why, Throwable e) {
         LOG.info(why, e);
       }
+      
+      @Override
+      public boolean isAborted()  {
+        return false;
+      }
     };
     this.watcher = new ZooKeeperWatcher(UTIL.getConfiguration(),
       this.getClass().getSimpleName(), this.abortable, true);

src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java

@@ -52,6 +52,11 @@ public class TestCatalogTrackerOnCluster {
         public void abort(String why, Throwable e) {
           LOG.error("Abort was called on 'bad root location writer'", e);
         }
+        
+        @Override
+        public boolean isAborted() {
+          return false;
+        }
     });
     ServerName nonsense =
       new ServerName("example.org", 1234, System.currentTimeMillis());

src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java

@@ -61,6 +61,12 @@ public class TestMetaReaderEditor {
       LOG.info(why, e);
       abort.set(true);
     }
+    
+    @Override
+    public boolean isAborted() {
+      return abort.get();
+    }
+    
   };
 
   @BeforeClass public static void beforeClass() throws Exception {

src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java

@@ -246,6 +246,11 @@ public class TestActiveMasterManager {
     @Override
     public void abort(final String msg, final Throwable t) {}
     
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+
     @Override
     public Configuration getConfiguration() {
       return null;

src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java

@@ -103,6 +103,11 @@ public class TestCatalogJanitor {
       //no-op
     }
     
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+
     @Override
     public boolean isStopped() {
       return false;
@@ -183,6 +188,11 @@ public class TestCatalogJanitor {
       //no-op
     }
     
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+
     @Override
     public void stop(String why) {
       //no-op

src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java

@@ -66,6 +66,11 @@ public class TestClockSkewDetection {
       @Override
       public void abort(String why, Throwable e) {}
       
+      @Override
+      public boolean isAborted() {
+        return false;
+      }
+
       @Override
       public boolean isStopped() {
         return false;

src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java

@@ -155,6 +155,11 @@ public class TestLogsCleaner {
     @Override
     public void abort(String why, Throwable e) {}
 
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+    
     @Override
     public void stop(String why) {}
 

src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java

@@ -228,10 +228,18 @@ public class TestMasterFailover {
     // Create a ZKW to use in the test
     ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
       "unittest", new Abortable() {
+    	boolean aborted = false;
         @Override
         public void abort(String why, Throwable e) {
+          this.aborted = true;
           throw new RuntimeException("Fatal ZK error, why=" + why, e);
         }
+        
+        @Override
+        public boolean isAborted() {
+          return this.aborted;
+        }
+        
     });
 
     // get all the master threads
@@ -545,11 +553,18 @@ public class TestMasterFailover {
     // Create a ZKW to use in the test
     ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
         "unittest", new Abortable() {
+          
           @Override
           public void abort(String why, Throwable e) {
             LOG.error("Fatal ZK Error: " + why, e);
             org.junit.Assert.assertFalse("Fatal ZK error", true);
           }
+          
+          @Override
+          public boolean isAborted() {
+            return false;
+          }
+          
     });
 
     // get all the master threads

src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java

@@ -132,4 +132,10 @@ class MockRegionServerServices implements RegionServerServices {
   public boolean isStopped() {
     return false;
   }
+
+  @Override
+  public boolean isAborted() {
+    // TODO Auto-generated method stub
+    return false;
+  }
 }

src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockServer.java

@@ -34,8 +34,10 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
  */
 class MockServer implements Server {
   static final Log LOG = LogFactory.getLog(MockServer.class);
-  boolean stopped = false;
   final static ServerName NAME = new ServerName("MockServer", 123, -1);
+  
+  boolean stopped;
+  boolean aborted;
   final ZooKeeperWatcher zk;
   final HBaseTestingUtility htu;
 
@@ -67,7 +69,8 @@ class MockServer implements Server {
   @Override
   public void abort(String why, Throwable e) {
     LOG.fatal("Abort why=" + why, e);
-    this.stopped = true;
+    stop(why);
+    this.aborted = true;
   }
 
   @Override
@@ -100,4 +103,10 @@ class MockServer implements Server {
   public ServerName getServerName() {
     return NAME;
   }
+
+  @Override
+  public boolean isAborted() {
+    // TODO Auto-generated method stub
+    return this.aborted;
+  }
 }

src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java

@@ -234,6 +234,11 @@ public class TestReplicationSourceManager {
       //To change body of implemented methods use File | Settings | File Templates.
     }
     
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+
     @Override
     public void stop(String why) {
       //To change body of implemented methods use File | Settings | File Templates.

src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java

@@ -58,6 +58,12 @@ public class TestZKTable {
       public void abort(String why, Throwable e) {
         LOG.info(why, e);
       }
+      
+      @Override
+      public boolean isAborted() {
+        return false;
+      }
+      
     };
     ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
       name, abortable, true);

src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java

@@ -300,6 +300,12 @@ public class TestZooKeeperNodeTracker {
   public static class StubAbortable implements Abortable {
     @Override
     public void abort(final String msg, final Throwable t) {}
+    
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+    
   }
 
   public static class StubWatcher implements Watcher {