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:16:39 GMT
Repository: hbase
Updated Branches:
  refs/heads/master ad2b1d846 -> e1cb405ad


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/e1cb405a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1cb405a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1cb405a

Branch: refs/heads/master
Commit: e1cb405adc4da68b6bd6ea68b2d5073f6c8fd7c3
Parents: ad2b1d8
Author: tedyu <yuzhihong@gmail.com>
Authored: Fri Apr 24 02:16:41 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Fri Apr 24 02:16:41 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/e1cb405a/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 dbe4d01..7f3878f 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
@@ -346,8 +346,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