hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-13528 A bug on selecting compaction pool (Shuaifeng Zhou)
Date Fri, 24 Apr 2015 09:21:53 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 67b8fa8ca -> 5b8f70d36


HBASE-13528 A bug on selecting compaction pool (Shuaifeng Zhou)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5b8f70d3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5b8f70d3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5b8f70d3

Branch: refs/heads/branch-1.0
Commit: 5b8f70d368924f37619bc9980f84700b5f505b72
Parents: 67b8fa8
Author: tedyu <yuzhihong@gmail.com>
Authored: Fri Apr 24 02:21:53 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Fri Apr 24 02:21:53 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/regionserver/CompactSplitThread.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5b8f70d3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
index d070fe7..94538fe 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
@@ -337,8 +337,7 @@ public class CompactSplitThread implements CompactionRequestor, PropagatingConfi
 
     // We assume that most compactions are small. So, put system compactions into small
     // pool; we will do selection there, and move to large pool if necessary.
-    long size = selectNow ? compaction.getRequest().getSize() : 0;
-    ThreadPoolExecutor pool = (!selectNow && s.throttleCompaction(size))
+    ThreadPoolExecutor pool = (selectNow && s.throttleCompaction(compaction.getRequest().getSize()))
       ? longCompactions : shortCompactions;
     pool.execute(new CompactionRunner(s, r, compaction, pool));
     if (LOG.isDebugEnabled()) {


Mime
View raw message