You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/03/22 04:40:47 UTC

svn commit: r1303648 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/master/HMaster.java test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java

Author: stack
Date: Thu Mar 22 03:40:46 2012
New Revision: 1303648

URL: http://svn.apache.org/viewvc?rev=1303648&view=rev
Log:
HBASE-5328 Small changes to Master to make it more testable

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1303648&r1=1303647&r2=1303648&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Mar 22 03:40:46 2012
@@ -479,7 +479,7 @@ Server {
     return new CatalogTracker(zk, conf, abortable, defaultTimeout);
   }
 
-  // Check if we should stop every second.
+  // Check if we should stop every 100ms
   private Sleeper stopSleeper = new Sleeper(100, this);
   private void loop() {
     while (!this.stopped) {

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java?rev=1303648&r1=1303647&r2=1303648&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java Thu Mar 22 03:40:46 2012
@@ -104,7 +104,7 @@ public class TestMasterNoCluster {
    * @throws KeeperException
    * @throws InterruptedException
    */
-  @Test
+  @Test (timeout=30000)
   public void testStopDuringStart()
   throws IOException, KeeperException, InterruptedException {
     HMaster master = new HMaster(TESTUTIL.getConfiguration());
@@ -326,4 +326,4 @@ public class TestMasterNoCluster {
       master.join();
     }
   }
-}
\ No newline at end of file
+}