Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 DCBF3748C for ; Fri, 14 Oct 2011 08:50:52 +0000 (UTC) Received: (qmail 90937 invoked by uid 500); 14 Oct 2011 08:50:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90792 invoked by uid 500); 14 Oct 2011 08:50:52 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 90784 invoked by uid 99); 14 Oct 2011 08:50:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 08:50:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 08:50:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ACC1A238888F for ; Fri, 14 Oct 2011 08:50:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1183241 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionManager.java Date: Fri, 14 Oct 2011 08:50:27 -0000 To: commits@cassandra.apache.org From: slebresne@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111014085027.ACC1A238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: slebresne Date: Fri Oct 14 08:50:27 2011 New Revision: 1183241 URL: http://svn.apache.org/viewvc?rev=1183241&view=rev Log: Only count compaction as active (for throttling) once the compaction lock has been acquired. patch by Fabien Rousseau and slebresne; reviewed by jbellis for CASSANDRA-3344 Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1183241&r1=1183240&r2=1183241&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Oct 14 08:50:27 2011 @@ -8,6 +8,8 @@ * Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357) * fix ColumnIndexer to use long offsets (CASSANDRA-3358) * Display CLI version string on startup (CASSANDRA-3196) + * Only count compaction as active (for throttling) when they have + successfully acquired the compaction lock (CASSANDRA-3344) 0.8.7 Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java?rev=1183241&r1=1183240&r2=1183241&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java Fri Oct 14 08:50:27 2011 @@ -1216,7 +1216,7 @@ public class CompactionManager implement public int getActiveCompactions() { - return executor.getActiveCount() + validationExecutor.getActiveCount(); + return CompactionExecutor.compactions.size(); } private static class CompactionExecutor extends DebuggableThreadPoolExecutor