HBASE-20879 Compacting memstore config should handle lower case
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2997b6d0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2997b6d0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2997b6d0 Branch: refs/heads/HBASE-20749 Commit: 2997b6d0714d5542784baf830e7c16a9ef6b62d6 Parents: dbcc80c Author: tedyu <[email protected]> Authored: Fri Jul 13 11:19:45 2018 -0700 Committer: tedyu <[email protected]> Committed: Fri Jul 13 11:19:45 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2997b6d0/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 c1e6788..db868fd 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 @@ -346,7 +346,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat if (inMemoryCompaction == null) { inMemoryCompaction = MemoryCompactionPolicy.valueOf(conf.get(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY, - CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT)); + CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT).toUpperCase()); } switch (inMemoryCompaction) { case NONE: http://git-wip-us.apache.org/repos/asf/hbase/blob/2997b6d0/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java index cdf4801..34f6ca1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java @@ -90,7 +90,7 @@ public class TestRecoveredEdits { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // Set it so we flush every 1M or so. Thats a lot. conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024*1024); - conf.set(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY, String.valueOf(policy)); + conf.set(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY, String.valueOf(policy).toLowerCase()); // The file of recovered edits has a column family of 'meta'. Also has an encoded regionname // of 4823016d8fca70b25503ee07f4c6d79f which needs to match on replay. final String encodedRegionName = "4823016d8fca70b25503ee07f4c6d79f";
