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 fr...@apache.org on 2018/11/29 09:50:02 UTC

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

Author: frm
Date: Thu Nov 29 09:50:02 2018
New Revision: 1847705

URL: http://svn.apache.org/viewvc?rev=1847705&view=rev
Log:
OAK-7918 - Output when a checkpoint is being checked

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=1847705&r1=1847704&r2=1847705&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 Thu Nov 29 09:50:02 2018
@@ -297,6 +297,14 @@ public abstract class ConsistencyChecker
     }
 
     private boolean checkCheckpointConsistency(SegmentNodeStore store, String checkpoint, List<PathToCheck> paths, JournalEntry entry, boolean binaries) {
+        boolean allConsistent = paths.stream().allMatch(p -> p.journalEntry != null);
+
+        if (allConsistent) {
+            return true;
+        }
+
+        onCheckCheckpoint(checkpoint);
+
         NodeState root = store.retrieve(checkpoint);
 
         if (root == null) {