Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-14468 addendum.

This commit is contained in:
Lars Hofhansl 2016-01-05 15:54:34 -08:00
parent 72d32cc96b
commit e8fbc9b43a
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -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