From e8fbc9b43a3742358e0bdfe441ff4ca9d14e127b Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Tue, 5 Jan 2016 15:54:34 -0800 Subject: [PATCH] HBASE-14468 addendum. --- .../org/apache/hadoop/hbase/master/HMaster.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 4472b655d0c..2e42acbdf06 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -1607,21 +1607,8 @@ public class HMaster extends HRegionServer implements MasterServices { ExploringCompactionPolicy.class.getName()); } - long majorCompactionPeriod = Long.MAX_VALUE; - String sv = htd.getConfigurationValue(HConstants.MAJOR_COMPACTION_PERIOD); - if (sv != null) { - majorCompactionPeriod = Long.parseLong(sv); - } else { - majorCompactionPeriod = - conf.getLong(HConstants.MAJOR_COMPACTION_PERIOD, majorCompactionPeriod); - } - String splitPolicyClassName = htd.getRegionSplitPolicyClassName(); - if (splitPolicyClassName == null) { - splitPolicyClassName = conf.get(HConstants.HBASE_REGION_SPLIT_POLICY_KEY); - } - int blockingFileCount = HStore.DEFAULT_BLOCKING_STOREFILE_COUNT; - sv = htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY); + String sv = htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY); if (sv != null) { blockingFileCount = Integer.parseInt(sv); } else { @@ -1634,7 +1621,7 @@ public class HMaster extends HRegionServer implements MasterServices { if (compactionPolicy == null) { compactionPolicy = className; } - if (className.equals(FIFOCompactionPolicy.class.getName()) == false) { + if (!compactionPolicy.equals(FIFOCompactionPolicy.class.getName())) { continue; } // FIFOCompaction