Author: alexparvulescu Date: Tue Apr 26 09:09:04 2016 New Revision: 1740973
URL: http://svn.apache.org/viewvc?rev=1740973&view=rev Log: OAK-4306 Disable cleanup when compaction is paused - separate fix for oak-segment-next Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Modified: jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1740973&r1=1740972&r2=1740973&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original) +++ jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Tue Apr 26 09:09:04 2016 @@ -582,7 +582,7 @@ public class FileStore implements Segmen humanReadableByteCount(needed), needed, humanReadableByteCount(delta), delta); if (cleanup) { - cleanupNeeded.set(true); + cleanupNeeded.set(!compactionStrategy.isPaused()); } return false; } @@ -642,7 +642,7 @@ public class FileStore implements Segmen } } if (cleanup) { - cleanupNeeded.set(true); + cleanupNeeded.set(!compactionStrategy.isPaused()); } return compacted; }
