Repository: hbase Updated Branches: refs/heads/0.98 868027a50 -> 5688ab4fa
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/5688ab4f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5688ab4f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5688ab4f Branch: refs/heads/0.98 Commit: 5688ab4fa2a5a96f6e2a22842d2143ca1f8ead34 Parents: 868027a Author: tedyu <[email protected]> Authored: Fri Apr 24 02:23:02 2015 -0700 Committer: tedyu <[email protected]> Committed: Fri Apr 24 02:23:02 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/5688ab4f/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 f9b12f7..5bdf977 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 @@ -326,8 +326,7 @@ public class CompactSplitThread implements CompactionRequestor { // 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())) ? largeCompactions : smallCompactions; pool.execute(new CompactionRunner(s, r, compaction, pool)); if (LOG.isDebugEnabled()) {
