hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-12549 Fix TestAssignmentManagerOnCluster#testAssignRacingWithSSH() flaky test (Virag Kothari) --ADDENDUM
Date Sat, 22 Nov 2014 05:33:21 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 d5bcf338d -> 7a3e8b55f


HBASE-12549 Fix TestAssignmentManagerOnCluster#testAssignRacingWithSSH() flaky test (Virag
 Kothari) --ADDENDUM


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7a3e8b55
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7a3e8b55
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7a3e8b55

Branch: refs/heads/branch-1
Commit: 7a3e8b55f8b331451c80da93e2f4a6d881db6d35
Parents: d5bcf33
Author: stack <stack@apache.org>
Authored: Fri Nov 21 21:32:55 2014 -0800
Committer: stack <stack@apache.org>
Committed: Fri Nov 21 21:32:55 2014 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/master/TestAssignmentManagerOnCluster.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/7a3e8b55/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
index e284e56..15ccaef 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
@@ -73,6 +73,7 @@ import org.apache.hadoop.hbase.util.ConfigUtil;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
+import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.zookeeper.ZKAssign;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.zookeeper.KeeperException;
@@ -320,6 +321,11 @@ public class TestAssignmentManagerOnCluster {
       ServerName masterServerName = TEST_UTIL.getMiniHBaseCluster().getMaster().getServerName();
       TEST_UTIL.getMiniHBaseCluster().stopMaster(masterServerName);
       TEST_UTIL.getMiniHBaseCluster().startMaster();
+      // Wait till master is active and is initialized
+      while (TEST_UTIL.getMiniHBaseCluster().getMaster() == null || 
+          !TEST_UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
+        Threads.sleep(1);
+      }
     }
   }
 


Mime
View raw message