Author: reschke
Date: Fri Apr 5 14:01:03 2019
New Revision: 1857009
URL: http://svn.apache.org/viewvc?rev=1857009&view=rev
Log:
OAK-8111: Create read-only DocumentNodeStore for oak-run recovery dry run
(ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 5 14:01:03 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,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,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
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,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
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java?rev=1857009&r1=1857008&r2=1857009&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java
Fri Apr 5 14:01:03 2019
@@ -19,8 +19,11 @@ package org.apache.jackrabbit.oak.run;
import java.io.Closeable;
import java.util.Arrays;
+import java.util.List;
+import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfoDocument;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.apache.jackrabbit.oak.plugins.document.LastRevRecoveryAgent;
import org.apache.jackrabbit.oak.plugins.document.MissingLastRevSeeker;
@@ -42,16 +45,26 @@ class RecoveryCommand implements Command
MapFactory.setInstance(new MapDBMapFactory());
Closer closer = Closer.create();
String h = "recovery mongodb://host:port/database|jdbc:... { dryRun }";
+
try {
- NodeStore store = Utils.bootstrapNodeStore(args, closer, h);
+ DocumentNodeStoreBuilder<?> builder =
Utils.createDocumentMKBuilder(args, closer, h);
- if (!(store instanceof DocumentNodeStore)) {
- System.err.println("Recovery only available for
DocumentNodeStore");
+ if (builder == null) {
+ System.err.println("Recovery only available for
DocumentNodeStore backed by MongoDB or RDB persistence");
System.exit(1);
}
- DocumentNodeStore dns = (DocumentNodeStore) store;
- DocumentStore ds = dns.getDocumentStore();
+ // dryRun implies readonly repo
+ boolean dryRun = Arrays.asList(args).contains("dryRun");
+ if (dryRun) {
+ builder.setReadOnlyMode();
+ }
+
+ DocumentNodeStore dns = builder.build();
+ closer.register(Utils.asCloseable(dns));
+
+ DocumentStore ds = builder.getDocumentStore();
+
LastRevRecoveryAgent agent = null;
MissingLastRevSeeker seeker = null;
@@ -71,12 +84,30 @@ class RecoveryCommand implements Command
System.exit(1);
}
+ if (builder.getClusterId() == 0) {
+ System.err.println("Please specify the clusterId for recovery
using --clusterId");
+ try {
+ List<ClusterNodeInfoDocument> all =
ClusterNodeInfoDocument.all(ds);
+ System.err.println("Existing entries in the clusternodes
collection are:");
+ for (ClusterNodeInfoDocument c : all) {
+ String state = c.isActive() ? "ACTIVE" : "INACTIVE";
+ System.err.println(c.getClusterId() +
+ " (" + state + "): " +
+ c.toString().replace('\n', ' '));
+ }
+ }
+ catch (Throwable e) {
+ e.printStackTrace(System.err);
+ }
+ System.exit(1);
+ }
+
Iterable<NodeDocument> docs = seeker.getCandidates(0);
if (docs instanceof Closeable) {
closer.register((Closeable) docs);
}
- boolean dryRun = Arrays.asList(args).contains("dryRun");
- agent.recover(docs, dns.getClusterId(), dryRun);
+
+ agent.recover(docs, builder.getClusterId(), dryRun);
} catch (Throwable e) {
throw closer.rethrow(e);
} finally {
Modified:
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1857009&r1=1857008&r2=1857009&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
Fri Apr 5 14:01:03 2019
@@ -181,6 +181,11 @@ class Utils {
}
@Nullable
+ static DocumentNodeStoreBuilder<?> createDocumentMKBuilder(String[] args,
Closer closer, String h) throws IOException {
+ return createDocumentMKBuilder(new NodeStoreOptions(h).parse(args),
closer);
+ }
+
+ @Nullable
static DocumentNodeStoreBuilder<?>
createDocumentMKBuilder(NodeStoreOptions options,
Closer closer)
throws IOException {
