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 ad...@apache.org on 2018/02/05 14:17:44 UTC
svn commit: r1823180 - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java
Author: adulceanu
Date: Mon Feb 5 14:17:44 2018
New Revision: 1823180
URL: http://svn.apache.org/viewvc?rev=1823180&view=rev
Log:
OAK-6373 - oak-run check should also check checkpoints
Default argument to --checkpoints is now called 'all'
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/ConsistencyChecker.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java?rev=1823180&r1=1823179&r2=1823180&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java Mon Feb 5 14:17:44 2018
@@ -51,8 +51,8 @@ class CheckCommand implements Command {
.withRequiredArg().ofType(String.class).withValuesSeparatedBy(',').defaultsTo("/");
OptionSpec<?> head = parser.accepts("head", "checks only latest /root (i.e without checkpoints)");
ArgumentAcceptingOptionSpec<String> cp = parser.accepts(
- "checkpoints", "checks only specified checkpoints (comma separated); leave empty to check all")
- .withOptionalArg().ofType(String.class).withValuesSeparatedBy(',').defaultsTo("/checkpoints");
+ "checkpoints", "checks only specified checkpoints (comma separated); use --checkpoints all to check all checkpoints")
+ .withOptionalArg().ofType(String.class).withValuesSeparatedBy(',').defaultsTo("all");
OptionSpec<?> ioStatistics = parser.accepts("io-stats", "Print I/O statistics (only for oak-segment-tar)");
OptionSet options = parser.parse(args);
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=1823180&r1=1823179&r2=1823180&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 Mon Feb 5 14:17:44 2018
@@ -150,7 +150,7 @@ public class ConsistencyChecker implemen
if (!checkpoints.isEmpty()) {
checkpointsSet.addAll(checkpoints);
- if (checkpointsSet.remove("/checkpoints")) {
+ if (checkpointsSet.remove("all")) {
checkpointsSet = Sets
.newLinkedHashSet(SegmentNodeStoreBuilders.builder(checker.store).build().checkpoints());
}