HBASE-25986 set default value of normalization enabled from hbase site (#3476) (#3372)

Signed-off-by: Viraj Jasani <vjasani@apache.org>

Author: mnpoonia

hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java

@@ -74,7 +74,6 @@ public class HTableDescriptor implements TableDescriptor, Comparable<HTableDescr
   public static final String PRIORITY = TableDescriptorBuilder.PRIORITY;
   public static final boolean DEFAULT_READONLY = TableDescriptorBuilder.DEFAULT_READONLY;
   public static final boolean DEFAULT_COMPACTION_ENABLED = TableDescriptorBuilder.DEFAULT_COMPACTION_ENABLED;
-  public static final boolean DEFAULT_NORMALIZATION_ENABLED = TableDescriptorBuilder.DEFAULT_NORMALIZATION_ENABLED;
   public static final long DEFAULT_MEMSTORE_FLUSH_SIZE = TableDescriptorBuilder.DEFAULT_MEMSTORE_FLUSH_SIZE;
   public static final int DEFAULT_REGION_REPLICATION = TableDescriptorBuilder.DEFAULT_REGION_REPLICATION;
   public static final boolean DEFAULT_REGION_MEMSTORE_REPLICATION = TableDescriptorBuilder.DEFAULT_REGION_MEMSTORE_REPLICATION;

hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java

@@ -290,7 +290,7 @@ default Collection<String> getCoprocessors() {
 
   /**
    * Check if normalization enable flag of the table is true. If flag is false
-   * then no region normalizer won't attempt to normalize this table.
+   * then region normalizer won't attempt to normalize this table.
    *
    * @return true if region normalization is enabled for this table
    */

hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java

@@ -219,11 +219,6 @@ public class TableDescriptorBuilder {
    */
   public static final boolean DEFAULT_MERGE_ENABLED = true;
 
-  /**
-   * Constant that denotes whether the table is normalized by default.
-   */
-  public static final boolean DEFAULT_NORMALIZATION_ENABLED = false;
-
   /**
    * Constant that denotes the maximum default size of the memstore in bytes after which
    * the contents are flushed to the store files.
@@ -245,7 +240,6 @@ public class TableDescriptorBuilder {
             String.valueOf(DEFAULT_MEMSTORE_FLUSH_SIZE));
     DEFAULT_VALUES.put(DURABILITY, DEFAULT_DURABLITY.name()); //use the enum name
     DEFAULT_VALUES.put(REGION_REPLICATION, String.valueOf(DEFAULT_REGION_REPLICATION));
-    DEFAULT_VALUES.put(NORMALIZATION_ENABLED, String.valueOf(DEFAULT_NORMALIZATION_ENABLED));
     DEFAULT_VALUES.put(PRIORITY, String.valueOf(DEFAULT_PRIORITY));
     DEFAULT_VALUES.keySet().stream()
             .map(s -> new Bytes(Bytes.toBytes(s))).forEach(RESERVED_KEYWORDS::add);
@@ -874,12 +868,11 @@ public ModifyableTableDescriptor setMergeEnabled(final boolean isEnable) {
     /**
      * Check if normalization enable flag of the table is true. If flag is false
      * then no region normalizer won't attempt to normalize this table.
-     *
      * @return true if region normalization is enabled for this table
-     */
+     **/
     @Override
     public boolean isNormalizationEnabled() {
-      return getOrDefault(NORMALIZATION_ENABLED_KEY, Boolean::valueOf, DEFAULT_NORMALIZATION_ENABLED);
+      return getOrDefault(NORMALIZATION_ENABLED_KEY, Boolean::valueOf, false);
     }
 
     /**

hbase-common/src/main/resources/hbase-default.xml

@@ -654,6 +654,13 @@ possible configurations would overwhelm and obscure the important.
     <description>The minimum size for a region to be considered for a merge, in whole
       MBs.</description>
   </property>
+  <property>
+    <name>hbase.table.normalization.enabled</name>
+    <value>false</value>
+    <description>This config is used to set default behaviour of normalizer at table level.
+      To override this at table level one can set NORMALIZATION_ENABLED at table descriptor level
+      and that property will be honored</description>
+  </property>
   <property>
     <name>hbase.server.thread.wakefrequency</name>
     <value>10000</value>

hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/RegionNormalizerWorker.java

@@ -26,6 +26,7 @@
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.conf.ConfigurationManager;
 import org.apache.hadoop.hbase.conf.ConfigurationObserver;
 import org.apache.hadoop.hbase.conf.PropagatingConfigurationObserver;
@@ -43,6 +44,8 @@
  */
 @InterfaceAudience.Private
 class RegionNormalizerWorker implements PropagatingConfigurationObserver, Runnable {
+  public static final String HBASE_TABLE_NORMALIZATION_ENABLED =
+      "hbase.table.normalization.enabled";
   private static final Logger LOG = LoggerFactory.getLogger(RegionNormalizerWorker.class);
 
   static final String RATE_LIMIT_BYTES_PER_SEC_KEY =
@@ -55,6 +58,7 @@ class RegionNormalizerWorker implements PropagatingConfigurationObserver, Runnab
   private final RateLimiter rateLimiter;
 
   private final long[] skippedCount;
+  private final boolean defaultNormalizerTableLevel;
   private long splitPlanCount;
   private long mergePlanCount;
 
@@ -71,6 +75,12 @@ class RegionNormalizerWorker implements PropagatingConfigurationObserver, Runnab
     this.splitPlanCount = 0;
     this.mergePlanCount = 0;
     this.rateLimiter = loadRateLimiter(configuration);
+    this.defaultNormalizerTableLevel = extractDefaultNormalizerValue(configuration);
+  }
+
+  private boolean extractDefaultNormalizerValue(final Configuration configuration) {
+    String s = configuration.get(HBASE_TABLE_NORMALIZATION_ENABLED);
+    return Boolean.parseBoolean(s);
   }
 
   @Override
@@ -181,10 +191,20 @@ private List<NormalizationPlan> calculatePlans(final TableName tableName) {
     final TableDescriptor tblDesc;
     try {
       tblDesc = masterServices.getTableDescriptors().get(tableName);
-      if (tblDesc != null && !tblDesc.isNormalizationEnabled()) {
-        LOG.debug("Skipping table {} because normalization is disabled in its table properties.",
-          tableName);
-        return Collections.emptyList();
+      boolean normalizationEnabled;
+      if (tblDesc != null) {
+        String defined = tblDesc.getValue(TableDescriptorBuilder.NORMALIZATION_ENABLED);
+        if(defined != null) {
+          normalizationEnabled = tblDesc.isNormalizationEnabled();
+        } else {
+          normalizationEnabled = this.defaultNormalizerTableLevel;
+        }
+        if (!normalizationEnabled) {
+          LOG.debug("Skipping table {} because normalization is disabled in its table properties " +
+              "and normalization is also disabled at table level by default",
+            tableName);
+          return Collections.emptyList();
+        }
       }
     } catch (IOException e) {
       LOG.debug("Skipping table {} because unable to access its table descriptor.", tableName, e);