Author: mduerig
Date: Wed Mar 29 08:12:53 2017
New Revision: 1789293
URL: http://svn.apache.org/viewvc?rev=1789293&view=rev
Log:
OAK-3349: Partial compaction
Return the compacted node instead of a boolean from forceCompact
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=1789293&r1=1789292&r2=1789293&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
Wed Mar 29 08:12:53 2017
@@ -63,6 +63,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -848,7 +849,8 @@ public class FileStore extends AbstractF
Stopwatch forceWatch = Stopwatch.createStarted();
cycles++;
- success = forceCompact(writer, or(cancel,
timeOut(forceTimeout, SECONDS)));
+ after = forceCompact(writer, or(cancel,
timeOut(forceTimeout, SECONDS)));
+ success = after != null;
if (success) {
gcListener.info("TarMK GC #{}: compaction
succeeded to force compact remaining commits " +
"after {} ({} ms).",
@@ -929,32 +931,35 @@ public class FileStore extends AbstractF
}
}
- private boolean forceCompact(@Nonnull final SegmentWriter writer,
- @Nonnull final Supplier<Boolean> cancel)
+ @CheckForNull
+ private SegmentNodeState forceCompact(@Nonnull final SegmentWriter
writer,
+ @Nonnull final Supplier<Boolean>
cancel)
throws InterruptedException {
- return null != revisions.
- setHead(new Function<RecordId, RecordId>() {
- @Nullable
- @Override
- public RecordId apply(RecordId base) {
- try {
- long t0 = currentTimeMillis();
- SegmentNodeState after = compact(
- segmentReader.readNode(base),
writer, cancel);
- if (after == null) {
- gcListener.info("TarMK GC #{}:
compaction cancelled after {} seconds",
- GC_COUNT,
(currentTimeMillis() - t0) / 1000);
- return null;
- } else {
- return after.getRecordId();
- }
- } catch (IOException e) {
- gcListener.error("TarMK GC #{" +
GC_COUNT + "}: Error during forced compaction.", e);
- return null;
- }
- }
- },
- timeout(gcOptions.getForceTimeout(), SECONDS));
+ RecordId compactedId = revisions.setHead(new Function<RecordId,
RecordId>() {
+ @Nullable
+ @Override
+ public RecordId apply(RecordId base) {
+ try {
+ long t0 = currentTimeMillis();
+ SegmentNodeState after = compact(
+ segmentReader.readNode(base), writer, cancel);
+ if (after == null) {
+ gcListener.info("TarMK GC #{}: compaction
cancelled after {} seconds",
+ GC_COUNT, (currentTimeMillis() - t0) /
1000);
+ return null;
+ } else {
+ return after.getRecordId();
+ }
+ } catch (IOException e) {
+ gcListener.error("TarMK GC #{" + GC_COUNT + "}: Error
during forced compaction.", e);
+ return null;
+ }
+ }
+ },
+ timeout(gcOptions.getForceTimeout(), SECONDS));
+ return compactedId != null
+ ? segmentReader.readNode(compactedId)
+ : null;
}
synchronized void cleanup() throws IOException {
