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 md...@apache.org on 2016/07/29 12:11:11 UTC
svn commit: r1754500 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
RecordCacheStats.java SegmentWriter.java
compaction/SegmentRevisionGCMBean.java file/FileStore.java
file/GCMonitorMBean.java
Author: mduerig
Date: Fri Jul 29 12:11:11 2016
New Revision: 1754500
URL: http://svn.apache.org/viewvc?rev=1754500&view=rev
Log:
OAK-4617: Align SegmentRevisionGC MBean with new generation based GC
OAK-4621: External invocation of background operations
OAK-4138 Decouple revision cleanup from the flush thread: instead of synchronizing, skip flush if already in progress
OAK-4618: Align GCMonitorMBean MBean with new generation based GC
OAK-4619: Unify RecordCacheStats and CacheStats
OAK-4445: Collect write statistics. This logs and clears the statistic on each compaction cycle instead of each run
FIXME tags
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMonitorMBean.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java?rev=1754500&r1=1754499&r2=1754500&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java Fri Jul 29 12:11:11 2016
@@ -32,6 +32,7 @@ import com.google.common.cache.CacheStat
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
+// FIXME OAK-4619: Unify RecordCacheStats and CacheStats
/**
* Statistics for {@link RecordCache}.
*/
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1754500&r1=1754499&r2=1754500&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java Fri Jul 29 12:11:11 2016
@@ -408,6 +408,7 @@ public class SegmentWriter {
return op.with(writer).with(this).writeNode(state, 0);
} finally {
if (isCompaction) {
+ // FIXME OAK-4445: Collect write statistics. This logs and clears the statistic on each compaction cycle instead of each run
LOG.info("Write node stats: {}", writeNodeStats);
LOG.info("Compact node stats: {}", compactNodeStats);
writeNodeStats.clear();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java?rev=1754500&r1=1754499&r2=1754500&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java Fri Jul 29 12:11:11 2016
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.segmen
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
+// FIXME OAK-4617: Align SegmentRevisionGC MBean with new generation based GC
public class SegmentRevisionGCMBean
extends AnnotatedStandardMBean
implements SegmentRevisionGC {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1754500&r1=1754499&r2=1754500&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Fri Jul 29 12:11:11 2016
@@ -312,7 +312,8 @@ public class FileStore implements Segmen
lock = null;
}
- // FIXME The following background operations are historically part of
+ // FIXME OAK-4621: External invocation of background operations
+ // The following background operations are historically part of
// the implementation of the FileStore, but they should better be
// scheduled and invoked by an external agent. The code deploying the
// FileStore might have better insights on when and how these background
@@ -660,6 +661,7 @@ public class FileStore implements Segmen
pendingRemove.addAll(cleanup());
}
+ // FIXME OAK-4138 Decouple revision cleanup from the flush thread: instead of synchronizing, skip flush if already in progress
// remove all obsolete tar generations
synchronized (pendingRemove) {
Iterator<File> iterator = pendingRemove.iterator();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMonitorMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMonitorMBean.java?rev=1754500&r1=1754499&r2=1754500&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMonitorMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCMonitorMBean.java Fri Jul 29 12:11:11 2016
@@ -23,6 +23,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
+// FIXME OAK-4618: Align GCMonitorMBean MBean with new generation based GC
/**
* MBean for monitoring the revision garbage collection process of the
* {@link FileStore}.