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/04/22 17:38:15 UTC
svn commit: r1740544 - in /jackrabbit/oak/trunk/oak-segment-next/src:
main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
Author: mduerig
Date: Fri Apr 22 15:38:15 2016
New Revision: 1740544
URL: http://svn.apache.org/viewvc?rev=1740544&view=rev
Log:
OAK-4282: Make the number of retained gc generation configurable
Update issue references in FIXME tags to point to point to this issue
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.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=1740544&r1=1740543&r2=1740544&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 Fri Apr 22 15:38:15 2016
@@ -882,9 +882,8 @@ public class FileStore implements Segmen
fileStoreLock.writeLock().unlock();
}
- // Do actual cleanup outside of the lock to prevent blocking
- // concurrent writers for a long time
- int generation = getGcGen() - 1; // FIXME OAK-3348 make the generation threshold configurable
+ // FIXME OAK-4282: Make the number of retained gc generation configurable
+ int generation = getGcGen() - 1;
Set<UUID> reclaim = newHashSet();
for (TarReader reader : cleaned.keySet()) {
reader.mark(bulkRefs, reclaim, generation);
Modified: jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java?rev=1740544&r1=1740543&r2=1740544&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-next/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java Fri Apr 22 15:38:15 2016
@@ -374,7 +374,8 @@ public class CompactionAndCleanupIT {
nodeStore.merge(preGCBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
- // FIXME OAK-3348 need to compact twice because of the generation cleanup threshold
+ // FIXME OAK-4282: Make the number of retained gc generation configurable
+ // Need to compact twice because of the generation cleanup threshold
// (currently hard coded to 2);
fileStore.compact();
fileStore.compact();