svn commit: r1762794 - in /jackrabbit/oak/trunk/oak-segment-tar/src: main/java/org/apache/jackrabbit/oak/segment/SegmentId.java test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java

[mduerig]

Author: mduerig
Date: Thu Sep 29 15:11:23 2016
New Revision: 1762794

URL: http://svn.apache.org/viewvc?rev=1762794&view=rev
Log:
OAK-4865: Test failure: HeavyWriteIT
Increasing the number of retained generations to avoid SNFE caused by 
referencing old generations

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java?rev=1762794&r1=1762793&r2=1762794&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
 Thu Sep 29 15:11:23 2016
@@ -141,7 +141,7 @@ public class SegmentId implements Compar
             sb.append(",").append(gcInfo);
         }
         if (gcGeneration >= 0) {
-            sb.append(",").append("segment-generation").append(gcGeneration);
+            sb.append(",").append("segment-generation=").append(gcGeneration);
         }
         return sb.toString();
     }

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java?rev=1762794&r1=1762793&r2=1762794&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/HeavyWriteIT.java
 Thu Sep 29 15:11:23 2016
@@ -20,6 +20,7 @@
 package org.apache.jackrabbit.oak.segment;
 
 import static org.apache.jackrabbit.oak.commons.CIHelper.travis;
+import static 
org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.defaultGCOptions;
 import static 
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
 import static org.junit.Assume.assumeTrue;
 
@@ -56,7 +57,11 @@ public class HeavyWriteIT {
 
     @Test
     public void heavyWrite() throws Exception {
-        final FileStore store = 
fileStoreBuilder(getFileStoreFolder()).withMaxFileSize(128).withMemoryMapping(false).build();
+        final FileStore store = fileStoreBuilder(getFileStoreFolder())
+                .withMaxFileSize(128)
+                .withMemoryMapping(false)
+                .withGCOptions(defaultGCOptions().setRetainedGenerations(42))
+                .build();
         final SegmentNodeStore nodeStore = 
SegmentNodeStoreBuilders.builder(store).build();
 
         int writes = 100;