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 al...@apache.org on 2016/04/26 11:06:45 UTC
svn commit: r1740971 -
/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Author: alexparvulescu
Date: Tue Apr 26 09:06:45 2016
New Revision: 1740971
URL: http://svn.apache.org/viewvc?rev=1740971&view=rev
Log:
OAK-4306 Disable cleanup when compaction is paused
Modified:
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1740971&r1=1740970&r2=1740971&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Tue Apr 26 09:06:45 2016
@@ -558,7 +558,7 @@ public class FileStore implements Segmen
humanReadableByteCount(needed), needed,
humanReadableByteCount(delta), delta);
if (cleanup) {
- cleanupNeeded.set(true);
+ cleanupNeeded.set(!compactionStrategy.isPaused());
}
return false;
}
@@ -622,7 +622,7 @@ public class FileStore implements Segmen
}
}
if (cleanup) {
- cleanupNeeded.set(true);
+ cleanupNeeded.set(!compactionStrategy.isPaused());
}
return compacted;
}