diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 82cf976..2eae13f 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -187,6 +187,11 @@ public final class HConstants { /** Parameter name for what master implementation to use. */ public static final String MASTER_IMPL= "hbase.master.impl"; + public static final String MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START = + "hbase.master.wait.on.regionservers.mintostart"; + + public static final int DEFAULT_MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START = 1; + /** Parameter name for how often threads should wake up */ public static final String THREAD_WAKE_FREQUENCY = "hbase.server.thread.wakefrequency"; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java index 16a3cd8..d673c53 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java @@ -85,7 +85,7 @@ public class HMasterCommandLine extends ServerCommandLine { if (cmd.hasOption("minServers")) { String val = cmd.getOptionValue("minServers"); - getConf().setInt("hbase.regions.server.count.min", + getConf().setInt(HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, Integer.valueOf(val)); LOG.debug("minServers set to " + val); } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index 6939d8e..4581897 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.ResponseConverter; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.PleaseHoldException; import org.apache.hadoop.hbase.Server; @@ -598,7 +599,9 @@ public class ServerManager { final long timeout = this.master.getConfiguration(). getLong("hbase.master.wait.on.regionservers.timeout", 4500); final int minToStart = this.master.getConfiguration(). - getInt("hbase.master.wait.on.regionservers.mintostart", 1); + getInt( + HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, + HConstants.DEFAULT_MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START); final int maxToStart = this.master.getConfiguration(). getInt("hbase.master.wait.on.regionservers.maxtostart", Integer.MAX_VALUE); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index be932d7..fd3ee27 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -655,7 +655,7 @@ public class HBaseTestingUtility { // These settings will make the server waits until this exact number of // regions servers are connected. - conf.setInt("hbase.master.wait.on.regionservers.mintostart", numSlaves); + conf.setInt(HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, numSlaves); conf.setInt("hbase.master.wait.on.regionservers.maxtostart", numSlaves); Configuration c = new Configuration(this.conf); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java index 7405961..62f3e51 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java @@ -147,7 +147,7 @@ public class TestMasterFailover { // Need to drop the timeout much lower conf.setInt("hbase.master.assignment.timeoutmonitor.period", 2000); conf.setInt("hbase.master.assignment.timeoutmonitor.timeout", 4000); - conf.setInt("hbase.master.wait.on.regionservers.mintostart", 3); + conf.setInt(HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, 3); conf.setInt("hbase.master.wait.on.regionservers.maxtostart", 3); // Start the cluster @@ -450,7 +450,7 @@ public class TestMasterFailover { // Need to drop the timeout much lower conf.setInt("hbase.master.assignment.timeoutmonitor.period", 2000); conf.setInt("hbase.master.assignment.timeoutmonitor.timeout", 4000); - conf.setInt("hbase.master.wait.on.regionservers.mintostart", 1); + conf.setInt(HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, 1); conf.setInt("hbase.master.wait.on.regionservers.maxtostart", 2); TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS); MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java index e3e69d9..bd3e217 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java @@ -246,7 +246,7 @@ public class TestMasterNoCluster { public void testCatalogDeploys() throws IOException, KeeperException, InterruptedException, DeserializationException, ServiceException { final Configuration conf = TESTUTIL.getConfiguration(); - conf.setInt("hbase.master.wait.on.regionservers.mintostart", 1); + conf.setInt(HConstants.MASTER_WAIT_ON_REGIONSERVERS_MIN_TO_START, 1); conf.setInt("hbase.master.wait.on.regionservers.maxtostart", 1); final long now = System.currentTimeMillis();