You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2016/01/06 00:55:42 UTC
[4/5] hbase git commit: HBASE-14468 addendum.
HBASE-14468 addendum.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f4a66fc0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4a66fc0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4a66fc0
Branch: refs/heads/branch-1
Commit: f4a66fc083a2c11e8de0ea283f45c5eeb0bac93e
Parents: 254af5a
Author: Lars Hofhansl <la...@apache.org>
Authored: Tue Jan 5 15:54:34 2016 -0800
Committer: Lars Hofhansl <la...@apache.org>
Committed: Tue Jan 5 15:55:00 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/HMaster.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4a66fc0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
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 744353f..d9e422b 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
@@ -1638,21 +1638,8 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
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 {
@@ -1665,7 +1652,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
if (compactionPolicy == null) {
compactionPolicy = className;
}
- if (className.equals(FIFOCompactionPolicy.class.getName()) == false) {
+ if (!compactionPolicy.equals(FIFOCompactionPolicy.class.getName())) {
continue;
}
// FIFOCompaction