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 2013/04/09 19:25:45 UTC
svn commit: r1466144 -
/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
Author: stack
Date: Tue Apr 9 17:25:45 2013
New Revision: 1466144
URL: http://svn.apache.org/r1466144
Log:
HBASE-8295 TestMasterFailover.testMasterFailoverWithMockedRITOnDeadRS is flaky
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java?rev=1466144&r1=1466143&r2=1466144&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java Tue Apr 9 17:25:45 2013
@@ -778,7 +778,11 @@ public class TestMasterFailover {
log("Waiting for master to be ready");
assertTrue(cluster.waitForActiveAndReadyMaster());
log("Master is ready");
-
+
+ // Wait until SSH processing completed for dead server.
+ while (master.getServerManager().areDeadServersInProgress()) {
+ Thread.sleep(10);
+ }
// Failover should be completed, now wait for no RIT
log("Waiting for no more RIT");
ZKAssign.blockUntilNoRIT(zkw);