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:11:03 UTC
svn commit: r1740974 - in /jackrabbit/oak/branches/1.4: ./
oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Author: alexparvulescu
Date: Tue Apr 26 09:11:03 2016
New Revision: 1740974
URL: http://svn.apache.org/viewvc?rev=1740974&view=rev
Log:
OAK-4306 Disable cleanup when compaction is paused
- merged rev 1740971
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 09:11:03 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1737998,1738004,1738775,1738963
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1737998,1738004,1738775,1738963,1740971
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1740974&r1=1740973&r2=1740974&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Tue Apr 26 09:11:03 2016
@@ -584,7 +584,7 @@ public class FileStore implements Segmen
humanReadableByteCount(needed), needed,
humanReadableByteCount(delta), delta);
if (cleanup) {
- cleanupNeeded.set(true);
+ cleanupNeeded.set(!compactionStrategy.isPaused());
}
return false;
}
@@ -648,7 +648,7 @@ public class FileStore implements Segmen
}
}
if (cleanup) {
- cleanupNeeded.set(true);
+ cleanupNeeded.set(!compactionStrategy.isPaused());
}
return compacted;
}