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/06/07 15:35:18 UTC

svn commit: r1747256 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: SegmentNotFoundException.java SegmentWriter.java

Author: mduerig
Date: Tue Jun  7 15:35:17 2016
New Revision: 1747256

URL: http://svn.apache.org/viewvc?rev=1747256&view=rev
Log:
OAK-4436: HeavyWriteIT sporadically fails
More precise excpetion message in case a deferred compaction cycles fails because the underlying revision has already been gc'ed

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundException.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundException.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundException.java?rev=1747256&r1=1747255&r2=1747256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundException.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNotFoundException.java Tue Jun  7 15:35:17 2016
@@ -38,6 +38,11 @@ public class SegmentNotFoundException ex
         this.segmentId = id.toString();
     }
 
+    public SegmentNotFoundException(String message, SegmentNotFoundException cause) {
+        super(message);
+        this.segmentId = cause.getSegmentId();
+    }
+
     public String getSegmentId() {
         return segmentId;
     }

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1747256&r1=1747255&r2=1747256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java Tue Jun  7 15:35:17 2016
@@ -994,9 +994,14 @@ public class SegmentWriter {
         }
 
         private boolean isOldGeneration(RecordId id) {
-            int thatGen = id.getSegment().getGcGeneration();
-            int thisGen = writer.getGeneration();
-            return thatGen < thisGen;
+            try {
+                int thatGen = id.getSegment().getGcGeneration();
+                int thisGen = writer.getGeneration();
+                return thatGen < thisGen;
+            } catch (SegmentNotFoundException snfe) {
+                throw new SegmentNotFoundException(
+                    "Cannot copy record from a generation that has been gc'ed already", snfe);
+            }
         }
 
         private class ChildNodeCollectorDiff extends DefaultNodeStateDiff {