Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B837A18B47 for ; Fri, 24 Apr 2015 09:21:53 +0000 (UTC) Received: (qmail 91964 invoked by uid 500); 24 Apr 2015 09:21:53 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 91924 invoked by uid 500); 24 Apr 2015 09:21:53 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 91915 invoked by uid 99); 24 Apr 2015 09:21:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 09:21:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74DAFE058E; Fri, 24 Apr 2015 09:21:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <9d376dfbfe724d3989604cee251baa14@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13528 A bug on selecting compaction pool (Shuaifeng Zhou) Date: Fri, 24 Apr 2015 09:21:53 +0000 (UTC) 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 Authored: Fri Apr 24 02:21:53 2015 -0700 Committer: tedyu 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()) {