svn commit: r1766690 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java

[mduerig]

Author: mduerig
Date: Wed Oct 26 15:11:06 2016
New Revision: 1766690

URL: http://svn.apache.org/viewvc?rev=1766690&view=rev
Log:
OAK-4941: Provide status for gc process

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java?rev=1766690&r1=1766689&r2=1766690&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
 Wed Oct 26 15:11:06 2016
@@ -46,6 +46,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Strings;
+import com.google.common.base.Supplier;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -460,7 +461,7 @@ public class SegmentNodeStoreService ext
 
         // Expose an MBean to managing and monitoring garbage collection
 
-        FileStoreGCMonitor fsgcm = new FileStoreGCMonitor(Clock.SIMPLE);
+        final FileStoreGCMonitor fsgcm = new FileStoreGCMonitor(Clock.SIMPLE);
         registrations.add(new CompositeRegistration(
             whiteboard.register(GCMonitor.class, fsgcm, emptyMap()),
             registerMBean(
@@ -477,10 +478,16 @@ public class SegmentNodeStoreService ext
                 store.cancelGC();
             }
         };
+        Supplier<String> statusMessage = new Supplier<String>() {
+            @Override
+            public String get() {
+                return fsgcm.getStatus();
+            }
+        };
         registrations.add(registerMBean(
                 whiteboard,
                 RevisionGCMBean.class,
-                new RevisionGC(store.getGCRunner(), cancelGC, executor),
+                new RevisionGC(store.getGCRunner(), cancelGC, statusMessage, 
executor),
                 RevisionGCMBean.TYPE,
                 "Revision garbage collection"
         ));