Repository: hbase Updated Branches: refs/heads/branch-1.4 c84ca0959 -> 04f486fe2
HBASE-18526 FIFOCompactionPolicy pre-check uses wrong scope (Vladimir Rodionov) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/04f486fe Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/04f486fe Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/04f486fe Branch: refs/heads/branch-1.4 Commit: 04f486fe2e62eb8d4cc346e7131fea3707757a89 Parents: c84ca09 Author: tedyu <yuzhih...@gmail.com> Authored: Tue Aug 15 11:10:49 2017 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Tue Aug 15 11:10:49 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/04f486fe/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 5b1aed6..bb9fcf3 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 @@ -2001,9 +2001,9 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } // 3. blocking file count - String sbfc = htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY); - if (sbfc != null) { - blockingFileCount = Integer.parseInt(sbfc); + sv = hcd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY); + if (sv != null) { + blockingFileCount = Integer.parseInt(sv); } if (blockingFileCount < 1000) { message =
