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 2017/12/19 23:59:07 UTC
hbase git commit: HBASE-19558 TestRegionsOnMasterOptions hack so it
works reliably
Repository: hbase
Updated Branches:
refs/heads/master 5e7d16a3c -> 3c78ad521
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/3c78ad52
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c78ad52
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c78ad52
Branch: refs/heads/master
Commit: 3c78ad52157576641ee6b42e874b5015b792f34d
Parents: 5e7d16a
Author: Michael Stack <st...@apache.org>
Authored: Tue Dec 19 15:57:11 2017 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Dec 19 15:59:02 2017 -0800
----------------------------------------------------------------------
.../hbase/master/balancer/TestRegionsOnMasterOptions.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3c78ad52/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();