This is an automated email from the ASF dual-hosted git repository. adulceanu pushed a commit to branch issues/OAK-10833 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 67658f1ce4968c3c11ec62a03452d6cdf955b1ba Author: Andrei Dulceanu <dulce...@adobe.com> AuthorDate: Fri May 24 15:28:06 2024 +0200 OAK-10833 - Consistency check reports success for repository with SNFE in checkpoints --- .../java/org/apache/jackrabbit/oak/segment/tool/Check.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java index 268697b3cf..cafb684aa1 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java @@ -586,7 +586,7 @@ public class Check { } private static boolean hasAllRevision(ConsistencyCheckResult result) { - return hasAnyHeadRevision(result) && hasAnyCheckpointRevision(result); + return hasAnyHeadRevision(result) && hasAllCheckpointRevision(result); } private static boolean hasAnyHeadRevision(ConsistencyCheckResult result) { @@ -604,6 +604,14 @@ public class Check { .anyMatch(Objects::nonNull); } + private static boolean hasAllCheckpointRevision(ConsistencyCheckResult result) { + return result.getCheckpointRevisions() + .values() + .stream() + .flatMap(m -> m.values().stream()) + .allMatch(Objects::nonNull); + } + private void printRevision(int indent, String path, Revision revision) { Optional<Revision> r = Optional.ofNullable(revision); print(