Index: src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (revision 1303646) +++ src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (working copy) @@ -104,7 +104,7 @@ * @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 @@ master.join(); } } -} \ No newline at end of file +} Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1303646) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -479,7 +479,7 @@ 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) {