You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2017/06/08 07:10:36 UTC
svn commit: r1798027 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
Author: tomekr
Date: Thu Jun 8 07:10:36 2017
New Revision: 1798027
URL: http://svn.apache.org/viewvc?rev=1798027&view=rev
Log:
OAK-5352: Enable RevisionGC task for non primary SegmentNodeStore
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=1798027&r1=1798026&r2=1798027&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 Thu Jun 8 07:10:36 2017
@@ -539,44 +539,42 @@ public class SegmentNodeStoreService {
}
// Expose an MBean to managing and monitoring garbage collection
-
- if (configuration.isPrimarySegmentStore()) {
- final FileStoreGCMonitor monitor = new FileStoreGCMonitor(Clock.SIMPLE);
- closeables.add(registrations.register(
- GCMonitor.class,
- monitor
+ final FileStoreGCMonitor monitor = new FileStoreGCMonitor(Clock.SIMPLE);
+ closeables.add(registrations.register(
+ GCMonitor.class,
+ monitor
+ ));
+ if (!configuration.isStandbyInstance()) {
+ closeables.add(registrations.registerMBean(
+ SegmentRevisionGC.class,
+ new SegmentRevisionGCMBean(store, gcOptions, monitor),
+ SegmentRevisionGC.TYPE,
+ "Segment node store revision garbage collection"
));
- if (!configuration.isStandbyInstance()) {
- closeables.add(registrations.registerMBean(
- SegmentRevisionGC.class,
- new SegmentRevisionGCMBean(store, gcOptions, monitor),
- SegmentRevisionGC.TYPE,
- "Segment node store revision garbage collection"
- ));
+ }
+
+ Runnable cancelGC = new Runnable() {
+
+ @Override
+ public void run() {
+ store.cancelGC();
}
- Runnable cancelGC = new Runnable() {
- @Override
- public void run() {
- store.cancelGC();
- }
-
- };
- Supplier<String> statusMessage = new Supplier<String>() {
-
- @Override
- public String get() {
- return monitor.getStatus();
- }
+ };
+ Supplier<String> statusMessage = new Supplier<String>() {
- };
- closeables.add(registrations.registerMBean(
- RevisionGCMBean.class,
- new RevisionGC(store.getGCRunner(), cancelGC, statusMessage, executor),
- RevisionGCMBean.TYPE,
- "Revision garbage collection"
- ));
- }
+ @Override
+ public String get() {
+ return monitor.getStatus();
+ }
+
+ };
+ closeables.add(registrations.registerMBean(
+ RevisionGCMBean.class,
+ new RevisionGC(store.getGCRunner(), cancelGC, statusMessage, executor),
+ RevisionGCMBean.TYPE,
+ "Revision garbage collection"
+ ));
// Expose statistics about the FileStore