commit 810db3dfcb5dd27779d5203dac41ac2e637a5f46
author 李小保 <lixiaobao@mininglamp.com> Wed Feb 27 19:30:02 2019 +0800
committer Duo Zhang <zhangduo@apache.org> Sat Sep 28 15:29:32 2024 +0800
tree 0705427e3d295c293c7d17d56cef2242ebaa9db3
parent 50cb28045006184721ea4b0a4d60286a21719b01

HBASE-21540 when set property "hbase.systemtables.compacting.memstore.type" to "basic" or "eager" will cause an exception

Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 699fad39a471601f8ecea0bb136dea07a334355d)

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index f2b0fa6..814a57a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -361,7 +361,7 @@
     MemoryCompactionPolicy inMemoryCompaction = null;
     if (this.getTableName().isSystemTable()) {
       inMemoryCompaction = MemoryCompactionPolicy
-        .valueOf(conf.get("hbase.systemtables.compacting.memstore.type", "NONE"));
+        .valueOf(conf.get("hbase.systemtables.compacting.memstore.type", "NONE").toUpperCase());
     } else {
       inMemoryCompaction = getColumnFamilyDescriptor().getInMemoryCompaction();
     }

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 80e0966..3c7bcd8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -88,6 +88,7 @@
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.MemoryCompactionPolicy;
+import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -1913,6 +1914,19 @@
   }
 
   @Test
+  public void testInMemoryCompactionTypeWithLowerCase() throws IOException, InterruptedException {
+    Configuration conf = HBaseConfiguration.create();
+    conf.set("hbase.systemtables.compacting.memstore.type", "eager");
+    init(name.getMethodName(), conf,
+      TableDescriptorBuilder.newBuilder(
+        TableName.valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME, "meta".getBytes())),
+      ColumnFamilyDescriptorBuilder.newBuilder(family)
+        .setInMemoryCompaction(MemoryCompactionPolicy.NONE).build());
+    assertTrue(((MemStoreCompactor) ((CompactingMemStore) store.memstore).compactor).toString()
+      .startsWith("eager".toUpperCase()));
+  }
+
+  @Test
   public void testSpaceQuotaChangeAfterReplacement() throws IOException {
     final TableName tn = TableName.valueOf(name.getMethodName());
     init(name.getMethodName());