From f80d2e9c8e88d3eaeed9a174c770699737f8c574 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Tue, 19 Dec 2017 15:57:11 -0800
Subject: [PATCH] HBASE-19558 TestRegionsOnMasterOptions hack so it works
 reliably

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

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 7319820d395..58c33331dbf 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();