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 2015/07/15 15:58:41 UTC
svn commit: r1691216 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
Author: mduerig
Date: Wed Jul 15 13:58:41 2015
New Revision: 1691216
URL: http://svn.apache.org/r1691216
Log:
OAK-2849: Improve revision gc on SegmentMK
Fix potential SNFE in test caused by using CLEAN_ALL in conjunction with a persisted compaction map
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java?rev=1691216&r1=1691215&r2=1691216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java Wed Jul 15 13:58:41 2015
@@ -312,13 +312,16 @@ public class CompactionAndCleanupTest {
FileStore fileStore = new NonCachingFileStore(directory, 1);
try {
final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
- fileStore.setCompactionStrategy(new CompactionStrategy(false, false, CLEAN_ALL, 0, (byte) 0) {
+ CompactionStrategy strategy = new CompactionStrategy(false, false, CLEAN_ALL, 0, (byte) 0) {
@Override
public boolean compacted(@Nonnull Callable<Boolean> setHead)
throws Exception {
return nodeStore.locked(setHead);
}
- });
+ };
+ // CLEAN_ALL and persisted compaction map results in SNFE in compaction map segments
+ strategy.setPersistCompactionMap(false);
+ fileStore.setCompactionStrategy(strategy);
// Add a property
NodeBuilder builder = nodeStore.getRoot().builder();