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-19558 TestRegionsOnMasterOptions hack so it works reliably
Date Tue, 19 Dec 2017 23:59:36 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 c739e3ece -> f80d2e9c8


HBASE-19558 TestRegionsOnMasterOptions hack so it works reliably


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

Branch: refs/heads/branch-2
Commit: f80d2e9c8e88d3eaeed9a174c770699737f8c574
Parents: c739e3e
Author: Michael Stack <stack@apache.org>
Authored: Tue Dec 19 15:57:11 2017 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Tue Dec 19 15:59:30 2017 -0800

----------------------------------------------------------------------
 .../hbase/master/balancer/TestRegionsOnMasterOptions.java   | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f80d2e9c/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java
index 7319820..58c3333 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java
@@ -193,6 +193,15 @@ public class TestRegionsOnMasterOptions {
         // still only carry system regions post crash.
         assertEquals(masterCount, mNewActualCount);
       }
+      // Disable balancer and wait till RIT done else cluster won't go down.
+      TEST_UTIL.getAdmin().balancerSwitch(false, true);
+      while (true) {
+        if (!TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager().
+            isMetaRegionInTransition()) {
+          break;
+        }
+        Threads.sleep(10);
+      }
     } finally {
       LOG.info("Running shutdown of cluster");
       TEST_UTIL.shutdownMiniCluster();


Mime
View raw message