Author: mduerig
Date: Wed Jan 27 16:29:31 2016
New Revision: 1727118
URL: http://svn.apache.org/viewvc?rev=1727118&view=rev
Log:
OAK-3934: Log ids of segments being released for gc because of their age
Add respective log message along with the age of the segment
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java?rev=1727118&r1=1727117&r2=1727118&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
Wed Jan 27 16:29:31 2016
@@ -27,8 +27,11 @@ import java.util.concurrent.Callable;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class CompactionStrategy {
+ private static final Logger LOG =
LoggerFactory.getLogger(CompactionStrategy.class);
public enum CleanupType {
@@ -152,7 +155,13 @@ public abstract class CompactionStrategy
case CLEAN_NONE:
return false;
case CLEAN_OLD:
- return compactionStart - id.getCreationTime() > olderThan;
+ long age = compactionStart - id.getCreationTime();
+ if (age > olderThan) {
+ LOG.info("TarMK released segment {} for gc. Age={}", id,
age);
+ return true;
+ } else {
+ return false;
+ }
}
return false;
}
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java?rev=1727118&r1=1727117&r2=1727118&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
(original)
+++
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
Wed Jan 27 16:29:31 2016
@@ -846,7 +846,7 @@ class TarReader implements Closeable {
sep = ", ";
}
- GC_LOG.info("Cleaned segments from {}: {}", file.getName(), uuids);
+ GC_LOG.info("TarMK cleaned segments from {}: {}", file.getName(),
uuids);
}
/**
