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 2019/10/28 16:25:22 UTC

svn commit: r1869082 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java

Author: adulceanu
Date: Mon Oct 28 16:25:22 2019
New Revision: 1869082

URL: http://svn.apache.org/viewvc?rev=1869082&view=rev
Log:
OAK-8719 - Oak run check command must return the status of repository consistency check
Contribution by Ieran Draghiciu

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java?rev=1869082&r1=1869081&r2=1869082&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java Mon Oct 28 16:25:22 2019
@@ -377,7 +377,7 @@ public class Check {
             ReadOnlyFileStore store = builder.buildReadOnly();
             JournalReader journal = new JournalReader(new LocalJournalFile(this.journal))
         ) {
-            run(store, journal);
+            int result = run(store, journal);
 
             if (ioStatistics) {
                 print("[I/O] Segment read: Number of operations: {0}", ioMonitor.ops.get());
@@ -390,14 +390,14 @@ public class Check {
                 repoStatistics.headPropertyCount = headPropertyCount;
             }
 
-            return 0;
+            return result;
         } catch (Exception e) {
             e.printStackTrace(err);
             return 1;
         }
     }
 
-    private void run(ReadOnlyFileStore store, JournalReader journal) {
+    private int run(ReadOnlyFileStore store, JournalReader journal) {
         Set<String> checkpoints = requestedCheckpoints;
 
         if (requestedCheckpoints.contains("all")) {
@@ -435,8 +435,10 @@ public class Check {
             }
             print("\nOverall");
             printOverallRevision(result.getOverallRevision());
+            return 0;
         } else {
             print("No good revision found");
+            return 1;
         }
     }