Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (revision 1409644) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (working copy) @@ -425,7 +425,7 @@ zkw.getRecoverableZooKeeper().create(tasknode1, slt.toByteArray(), Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - int to = 1000; + int to = 2000; conf.setInt("hbase.splitlog.manager.timeout", to); conf.setInt("hbase.splitlog.manager.unassigned.timeout", 2 * to); conf.setInt("hbase.splitlog.manager.timeoutmonitor.period", 100); @@ -451,10 +451,10 @@ // since we have stopped heartbeating the owned node therefore it should // get resubmitted LOG.info("waiting for manager to resubmit the orphan task"); - waitForCounter(tot_mgr_resubmit, 0, 1, to + 500); + waitForCounter(tot_mgr_resubmit, 0, 1, to + to/2); // now all the nodes are unassigned. manager should post another rescan - waitForCounter(tot_mgr_resubmit_unassigned, 0, 1, 2 * to + 500); + waitForCounter(tot_mgr_resubmit_unassigned, 0, 1, 2 * to + to/2); } @Test