diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 4c8b641c0f..a486ed9053 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -2658,7 +2658,11 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { decrementMinRegionServerCount(); } - private void decrementMinRegionServerCount() { + /* + * Doesn't need to be called when using expireRegionServerSession as it will automatically + * decrement the min count + */ + public void decrementMinRegionServerCount() { // decrement the count for this.conf, for newly spwaned master // this.hbaseCluster shares this configuration too decrementMinRegionServerCount(getConfiguration()); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java index 5c452ffec0..2a1db8d594 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java @@ -61,7 +61,7 @@ public class TestMetaShutdownHandler { @BeforeClass public static void setUpBeforeClass() throws Exception { - TEST_UTIL.startMiniCluster(2, 3, null, null, MyRegionServer.class); + TEST_UTIL.startMiniCluster(2, 4, null, null, MyRegionServer.class); } @AfterClass @@ -105,6 +105,7 @@ public class TestMetaShutdownHandler { String rsEphemeralNodePath = ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, metaServerName.toString()); ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath); + TEST_UTIL.decrementMinRegionServerCount(); LOG.info("Deleted the znode for the RegionServer hosting hbase:meta; waiting on SSH"); // Wait for SSH to finish final ServerManager serverManager = master.getServerManager(); @@ -160,7 +161,7 @@ public class TestMetaShutdownHandler { master.abort("Abort to test whether standby assign the meta OPENING region"); AssignmentTestingUtil.killRs(TEST_UTIL, metaServerName); final HMaster oldMaster = master; - TEST_UTIL.decrementMinRegionServerCount(conf); + TEST_UTIL.decrementMinRegionServerCount(); TEST_UTIL.waitFor(120000, 200, new Waiter.Predicate() { @Override public boolean evaluate() throws Exception {