svn commit: r956943 - in /cassandra/trunk/src/java/org/apache/cassandra/db: CompactionManager.java CompactionManagerMBean.java

[jbellis]

Author: jbellis
Date: Tue Jun 22 16:23:51 2010
New Revision: 956943

URL: http://svn.apache.org/viewvc?rev=956943&view=rev
Log:
add CompletedTasks to CompactionManager.  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
    cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.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=956943&r1=956942&r2=956943&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue 
Jun 22 16:23:51 2010
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 
 
 import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
+import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.io.*;
 import org.apache.cassandra.io.sstable.*;
@@ -625,7 +626,7 @@ public class CompactionManager implement
 
         public CompactionExecutor()
         {
-            super("COMPACTION-POOL");
+            super("CompactionExecutor");
         }
 
         @Override
@@ -682,4 +683,9 @@ public class CompactionManager implement
         }
         return n;
     }
+
+    public long getCompletedTasks()
+    {
+        return executor.getTaskCount() - executor.getCompletedTaskCount();
+    }
 }

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java?rev=956943&r1=956942&r2=956943&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java 
Tue Jun 22 16:23:51 2010
@@ -59,4 +59,9 @@ public interface CompactionManagerMBean
      * @return estimated number of compactions remaining to perform
      */
     public int getPendingTasks();
+
+    /**
+     * @return number of completed compactions since server [re]start
+     */
+    public long getCompletedTasks();
 }