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/01/08 14:08:47 UTC
svn commit: r1723722 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Author: mduerig
Date: Fri Jan 8 13:08:47 2016
New Revision: 1723722
URL: http://svn.apache.org/viewvc?rev=1723722&view=rev
Log:
OAK-3812: Disable compaction gain estimation if compaction is paused
Skip estimation and log a message
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1723722&r1=1723721&r2=1723722&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Fri Jan 8 13:08:47 2016
@@ -589,7 +589,12 @@ public class FileStore implements Segmen
byte gainThreshold = compactionStrategy.getGainThreshold();
boolean runCompaction = true;
- if (gainThreshold > 0) {
+ if (gainThreshold <= 0) {
+ gcMonitor.info("TarMK GC #{}: estimation skipped because gain threshold value ({} <= 0)", gcCount,
+ gainThreshold);
+ } else if (compactionStrategy.isPaused()) {
+ gcMonitor.info("TarMK GC #{}: estimation skipped because compaction is paused", gcCount);
+ } else {
gcMonitor.info("TarMK GC #{}: estimation started", gcCount);
Supplier<Boolean> shutdown = newShutdownSignal();
CompactionGainEstimate estimate = estimateCompactionGain(shutdown);
@@ -622,9 +627,6 @@ public class FileStore implements Segmen
estimate.getReachableSize(), estimate.getTotalSize());
}
}
- } else {
- gcMonitor.info("TarMK GC #{}: estimation skipped due to gain threshold value ({}). Running compaction",
- gcCount, gainThreshold);
}
if (runCompaction) {