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/09/22 09:22:34 UTC
svn commit: r1761872 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Author: mduerig
Date: Thu Sep 22 09:22:34 2016
New Revision: 1761872
URL: http://svn.apache.org/viewvc?rev=1761872&view=rev
Log:
OAK-4371: Overly zealous warning about checkpoints on compaction
Remove the checkpoint warning entirely
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
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=1761872&r1=1761871&r2=1761872&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 Thu Sep 22 09:22:34 2016
@@ -95,7 +95,6 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.SegmentId;
import org.apache.jackrabbit.oak.segment.SegmentIdFactory;
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
-import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
import org.apache.jackrabbit.oak.segment.SegmentReader;
import org.apache.jackrabbit.oak.segment.SegmentStore;
@@ -981,16 +980,6 @@ public class FileStore implements Segmen
Stopwatch watch = Stopwatch.createStarted();
SegmentNodeState before = getHead();
- long existing = before.getChildNode(SegmentNodeStore.CHECKPOINTS)
- .getChildNodeCount(Long.MAX_VALUE);
- if (existing > 1) {
- // FIXME OAK-4371: Overly zealous warning about checkpoints on compaction
- // Make the number of checkpoints configurable above which the warning should be issued?
- gcListener.warn(
- "TarMK GC #{}: compaction found {} checkpoints, you might need to run checkpoint cleanup",
- GC_COUNT, existing);
- }
-
final int newGeneration = getGcGeneration() + 1;
SegmentBufferWriter bufferWriter = new SegmentBufferWriter(this, tracker, segmentReader, "c", newGeneration);
Supplier<Boolean> cancel = newCancelCompactionCondition();