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
