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 2018/10/19 10:35:50 UTC

svn commit: r1844325 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java

Author: mduerig
Date: Fri Oct 19 10:35:50 2018
New Revision: 1844325

URL: http://svn.apache.org/viewvc?rev=1844325&view=rev
Log:
OAK-7837: oak-run check crashes with SNFE
Catch SNFE to mark revision as invalid

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java?rev=1844325&r1=1844324&r2=1844325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java Fri Oct 19 10:35:50 2018
@@ -53,6 +53,7 @@ import org.apache.jackrabbit.oak.api.Typ
 import org.apache.jackrabbit.oak.segment.SegmentBlob;
 import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
 import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
+import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
 import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
 import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -231,8 +232,8 @@ public class ConsistencyChecker implemen
                     if (overallValid) {
                         lastValidJournalEntry = journalEntry;
                     }
-                } catch (IllegalArgumentException e) {
-                    checker.printError("Skipping invalid record id {0}", revision);
+                } catch (IllegalArgumentException | SegmentNotFoundException e) {
+                    checker.printError("Skipping invalid record id {0}: {1}", revision, e);
                 }
             }