You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/01/20 18:32:46 UTC

hbase git commit: HBASE-15098 Normalizer switch in configuration is not used

Repository: hbase
Updated Branches:
  refs/heads/master 5e08e2ceb -> bd9906736


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/bd990673
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd990673
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd990673

Branch: refs/heads/master
Commit: bd9906736ef139b410a47799e6bc438a3a367d50
Parents: 5e08e2c
Author: stack <st...@apache.org>
Authored: Wed Jan 20 09:32:38 2016 -0800
Committer: stack <st...@apache.org>
Committed: Wed Jan 20 09:32:38 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 | 1 -
 3 files changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bd990673/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 6fafad3..1b71cb4 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/bd990673/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 d9a1994..eefd327 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -574,12 +574,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/bd990673/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 4bcccc6..6ec2e95 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
@@ -67,7 +67,6 @@ 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.