You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/10/12 23:19:09 UTC

svn commit: r1021928 - /cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java

Author: jbellis
Date: Tue Oct 12 21:19:09 2010
New Revision: 1021928

URL: http://svn.apache.org/viewvc?rev=1021928&view=rev
Log:
add executor task queue size to CompactionManager pendingTasks.  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1021928&r1=1021927&r2=1021928&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue Oct 12 21:19:09 2010
@@ -670,14 +670,12 @@ public class CompactionManager implement
     {
         int n = 0;
         for (Integer i : estimatedCompactions.values())
-        {
             n += i;
-        }
-        return n;
+        return (int) (executor.getTaskCount() - executor.getCompletedTaskCount()) + n;
     }
 
     public long getCompletedTasks()
     {
-        return executor.getTaskCount() - executor.getCompletedTaskCount();
+        return executor.getCompletedTaskCount();
     }
 }