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 re...@apache.org on 2019/06/14 13:03:11 UTC

svn commit: r1861342 - in /jackrabbit/oak/branches/1.10: ./ oak-run/README.md oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java

Author: reschke
Date: Fri Jun 14 13:03:11 2019
New Revision: 1861342

URL: http://svn.apache.org/viewvc?rev=1861342&view=rev
Log:
OAK-8378: rdb/oak-run: update usage and documentation for garbage command (ported to 1.10)

Modified:
    jackrabbit/oak/branches/1.10/   (props changed)
    jackrabbit/oak/branches/1.10/oak-run/README.md
    jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java

Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 14 13:03:11 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859711,1859716,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202
 ,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859711,1859716,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202
 ,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.10/oak-run/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/README.md?rev=1861342&r1=1861341&r2=1861342&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-run/README.md (original)
+++ jackrabbit/oak/branches/1.10/oak-run/README.md Fri Jun 14 13:03:11 2019
@@ -422,13 +422,15 @@ Garbage
 =======
 
 The garbage mode can the used to identify blob garbage still referenced by
-documents in a MongoMK repository. It can be invoked like this:
+documents in a DocumentMK repository. It can be invoked like this:
 
     $ java -jar oak-run-*.jar garbage [options] mongodb://host:port/database
 
+(or, for RDBMK instances, use "jdbc:...").
+
 The following recovery options (with default values) are currently supported:
 
-    --clusterId         - MongoMK clusterId (default: 0 -> automatic)
+    --clusterId         - DocumentMK clusterId (default: 0 -> automatic)
 
 The tool will scan the store for documents with blob references and print a
 report with the top 100 documents with blob references considered garbage. The

Modified: jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java?rev=1861342&r1=1861341&r2=1861342&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java (original)
+++ jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java Fri Jun 14 13:03:11 2019
@@ -28,7 +28,7 @@ class GarbageCommand implements Command
     @Override
     public void execute(String... args) throws Exception {
         Closer closer = Closer.create();
-        String h = "garbage mongodb://host:port/database";
+        String h = "garbage mongodb://host:port/database | jdbc:...";
         try {
             NodeStore store = Utils.bootstrapNodeStore(args, closer, h);
             if (!(store instanceof DocumentNodeStore)) {