diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index f617245..ee3207e 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -541,11 +541,6 @@ possible configurations would overwhelm and obscure the important. the balancer will not assign any region to any backup Master - hbase.regions.slop - 0.2 - Rebalance if any regionserver has average + (average * slop) regions. - - hbase.server.thread.wakefrequency 10000 Time to sleep in between searches for work (in milliseconds). diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index c06097c..a031fcb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseIOException; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RegionLoad; import org.apache.hadoop.hbase.ServerName; @@ -918,7 +919,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer { } protected void setSlop(Configuration conf) { - this.slop = conf.getFloat("hbase.regions.slop", (float) 0.2); + this.slop = conf.getFloat(HConstants.LOAD_BALANCER_SLOP_KEY, (float) 0.2); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index e353316..0c69827 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -34,6 +34,7 @@ import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterStatus; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RegionLoad; import org.apache.hadoop.hbase.ServerLoad; @@ -171,7 +172,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { @Override protected void setSlop(Configuration conf) { - this.slop = conf.getFloat("hbase.regions.slop", 0.001F); + this.slop = conf.getFloat(HConstants.LOAD_BALANCER_SLOP_KEY, 0.001F); } @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java index fdcb00c..9252da9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java @@ -165,7 +165,8 @@ public class TestRegionRebalancing { // TODO: Fix this test. Old balancer used to run with 'slop'. New // balancer does not. boolean success = false; - float slop = (float)UTIL.getConfiguration().getFloat("hbase.regions.slop", 0.1f); + float slop = (float)UTIL.getConfiguration().getFloat(HConstants.LOAD_BALANCER_SLOP_KEY, 0.2f); + if (slop <= 0) slop = 1; for (int i = 0; i < 5; i++) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java index 9b7ade8..b998cea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; @@ -53,7 +54,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { @BeforeClass public static void beforeAllTests() throws Exception { Configuration conf = HBaseConfiguration.create(); - conf.set("hbase.regions.slop", "0"); + conf.set(HConstants.LOAD_BALANCER_SLOP_KEY, "0"); loadBalancer = new SimpleLoadBalancer(); loadBalancer.setConf(conf); }