Repository: hbase Updated Branches: refs/heads/branch-1 17130e4d2 -> 44dc9d116
HBASE-15098 Normalizer switch in configuration is not used Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/44dc9d11 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/44dc9d11 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/44dc9d11 Branch: refs/heads/branch-1 Commit: 44dc9d1162948bbca0ad35e559b22ee59382548b Parents: 17130e4 Author: stack <[email protected]> Authored: Wed Jan 20 09:32:38 2016 -0800 Committer: stack <[email protected]> Committed: Wed Jan 20 09:36:46 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ---- hbase-common/src/main/resources/hbase-default.xml | 6 ------ .../master/normalizer/TestSimpleRegionNormalizerOnCluster.java | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/44dc9d11/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index c466d8b..5ae5ebf 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -134,10 +134,6 @@ public final class HConstants { public static final String HBASE_MASTER_NORMALIZER_CLASS = "hbase.master.normalizer.class"; - /** Config for enabling/disabling pluggable region normalizer */ - public static final String HBASE_NORMALIZER_ENABLED = - "hbase.normalizer.enabled"; - /** Cluster is standalone or pseudo-distributed */ public static final boolean CLUSTER_IS_LOCAL = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/44dc9d11/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 4abefc2..ca104cd 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -580,12 +580,6 @@ possible configurations would overwhelm and obscure the important. <description>Period at which the region balancer runs in the Master.</description> </property> <property> - <name>hbase.normalizer.enabled</name> - <value>false</value> - <description>If set to true, Master will try to keep region size - within each table approximately the same.</description> - </property> - <property> <name>hbase.normalizer.period</name> <value>1800000</value> <description>Period at which the region normalizer runs in the Master.</description> http://git-wip-us.apache.org/repos/asf/hbase/blob/44dc9d11/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java index 84ddd0e..0bab6aa 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java @@ -61,7 +61,7 @@ public class TestSimpleRegionNormalizerOnCluster { public static void beforeAllTests() throws Exception { // we will retry operations when PleaseHoldException is thrown TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 3); - TEST_UTIL.getConfiguration().setBoolean(HConstants.HBASE_NORMALIZER_ENABLED, true); + TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true); // Start a cluster of two regionservers. TEST_UTIL.startMiniCluster(1);
