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 to...@apache.org on 2016/10/25 10:54:46 UTC
svn commit: r1766509 - in /jackrabbit/oak/trunk/oak-upgrade/src:
main/java/org/apache/jackrabbit/oak/upgrade/
main/java/org/apache/jackrabbit/oak/upgrade/cli/
main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/
test/java/org/apache/jackrabbit/oak/u...
Author: tomekr
Date: Tue Oct 25 10:54:46 2016
New Revision: 1766509
URL: http://svn.apache.org/viewvc?rev=1766509&view=rev
Log:
OAK-4983: Add --verify mode to the RepositorySidegrade
Added:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/LoggingEqualsDiff.java
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java
Added: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/LoggingEqualsDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/LoggingEqualsDiff.java?rev=1766509&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/LoggingEqualsDiff.java (added)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/LoggingEqualsDiff.java Tue Oct 25 10:54:46 2016
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.upgrade;
+
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+import org.slf4j.Logger;
+
+public class LoggingEqualsDiff implements NodeStateDiff {
+
+ private final Logger log;
+
+ private final String path;
+
+ private boolean pathDisplayed;
+
+ public LoggingEqualsDiff(Logger log, String path) {
+ this.log = log;
+ this.path = path;
+ }
+
+ @Override
+ public boolean propertyAdded(PropertyState after) {
+ displayPath();
+ log.info(" + {}<{}>", after.getName(), after.getType());
+ return false;
+ }
+
+ @Override
+ public boolean propertyChanged(PropertyState before, PropertyState after) {
+ displayPath();
+ log.info(" ^ {}<{}>", before.getName(), before.getType());
+ return false;
+ }
+
+ @Override
+ public boolean propertyDeleted(PropertyState before) {
+ displayPath();
+ log.info(" - {}<{}>", before.getName(), before.getType());
+ return false;
+ }
+
+ @Override
+ public boolean childNodeAdded(String name, NodeState after) {
+ String childPath = PathUtils.concat(path, name);
+ log.info("+ {}", childPath);
+ return false;
+ }
+
+ @Override
+ public boolean childNodeChanged(String name, NodeState before, NodeState after) {
+ String childPath = PathUtils.concat(path, name);
+ return after.compareAgainstBaseState(before, new LoggingEqualsDiff(log, childPath));
+ }
+
+ @Override
+ public boolean childNodeDeleted(String name, NodeState before) {
+ String childPath = PathUtils.concat(path, name);
+ log.info("- {}", childPath);
+ return false;
+ }
+
+ private void displayPath() {
+ if (!pathDisplayed) {
+ log.info("^ {}", path);
+ pathDisplayed = true;
+ }
+ }
+}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1766509&r1=1766508&r2=1766509&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Tue Oct 25 10:54:46 2016
@@ -29,7 +29,6 @@ import javax.jcr.RepositoryException;
import com.google.common.base.Function;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider;
@@ -107,7 +106,9 @@ public class RepositorySidegrade {
private boolean filterLongNames = true;
- private boolean skipInitialization = false;
+ private boolean verify = false;
+
+ private boolean onlyVerify = false;
private List<CommitHook> customCommitHooks = null;
@@ -223,14 +224,12 @@ public class RepositorySidegrade {
this.filterLongNames = filterLongNames;
}
- /**
- * Skip the new repository initialization. Only copy content passed in the
- * {@link #includePaths}.
- *
- * @param skipInitialization
- */
- public void setSkipInitialization(boolean skipInitialization) {
- this.skipInitialization = skipInitialization;
+ public void setVerify(boolean verify) {
+ this.verify = verify;
+ }
+
+ public void setOnlyVerify(boolean onlyVerify) {
+ this.onlyVerify = onlyVerify;
}
/**
@@ -250,31 +249,31 @@ public class RepositorySidegrade {
* during the copy operation as this method requires exclusive access
* to the repositories.
*
- * @param initializer optional extra repository initializer to use
+ * @param initializer optional repository initializer to use
*
* @throws RepositoryException if the copy operation fails
*/
public void copy(RepositoryInitializer initializer) throws RepositoryException {
try {
- NodeBuilder targetRoot = target.getRoot().builder();
+ if (!onlyVerify) {
+ NodeBuilder targetRoot = target.getRoot().builder();
- if (skipInitialization) {
- LOG.info("Skipping the repository initialization");
- } else {
- new InitialContent().initialize(targetRoot);
if (initializer != null) {
initializer.initialize(targetRoot);
}
- }
- final NodeState reportingSourceRoot = ReportingNodeState.wrap(source.getRoot(), new LoggingReporter(LOG, "Copying", LOG_NODE_COPY, -1));
- final NodeState sourceRoot;
- if (filterLongNames) {
- sourceRoot = NameFilteringNodeState.wrap(reportingSourceRoot);
- } else {
- sourceRoot = reportingSourceRoot;
+ final NodeState reportingSourceRoot = ReportingNodeState.wrap(source.getRoot(), new LoggingReporter(LOG, "Copying", LOG_NODE_COPY, -1));
+ final NodeState sourceRoot;
+ if (filterLongNames) {
+ sourceRoot = NameFilteringNodeState.wrap(reportingSourceRoot);
+ } else {
+ sourceRoot = reportingSourceRoot;
+ }
+ copyState(sourceRoot, targetRoot);
+ }
+ if (verify || onlyVerify) {
+ verify();
}
- copyState(sourceRoot, targetRoot);
} catch (Exception e) {
throw new RepositoryException("Failed to copy content", e);
@@ -466,4 +465,26 @@ public class RepositorySidegrade {
return null;
}
}
+
+ private void verify() {
+ final NodeState sourceRoot;
+ final NodeState targetRoot;
+
+ if (source instanceof TarNodeStore && target instanceof TarNodeStore) {
+ sourceRoot = ((TarNodeStore) source).getSuperRoot();
+ targetRoot = ((TarNodeStore) target).getSuperRoot();
+ } else {
+ sourceRoot = source.getRoot();
+ targetRoot = target.getRoot();
+ }
+
+ final NodeState reportingSource = ReportingNodeState.wrap(sourceRoot, new LoggingReporter(LOG, "Verifying", LOG_NODE_COPY, -1));
+
+ LOG.info("Verifying whether repositories are identical");
+ if (targetRoot.compareAgainstBaseState(reportingSource, new LoggingEqualsDiff(LOG, "/"))) {
+ LOG.info("Verification result: both repositories are identical");
+ } else {
+ LOG.warn("Verification result: repositories are not identical");
+ }
+ }
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java?rev=1766509&r1=1766508&r2=1766509&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java Tue Oct 25 10:54:46 2016
@@ -114,8 +114,9 @@ public class MigrationFactory {
sidegrade.setMerges(options.getMergePaths());
}
sidegrade.setFilterLongNames(stores.getSrcType().isSupportLongNames() && !stores.getDstType().isSupportLongNames());
- sidegrade.setSkipInitialization(options.isSkipInitialization());
sidegrade.setIncludeIndex(options.isIncludeIndex());
+ sidegrade.setVerify(options.isVerify());
+ sidegrade.setOnlyVerify(options.isOnlyVerify());
return sidegrade;
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1766509&r1=1766508&r2=1766509&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Tue Oct 25 10:54:46 2016
@@ -59,6 +59,10 @@ public class MigrationOptions {
private final boolean ignoreMissingBinaries;
+ private final boolean verify;
+
+ private final boolean onlyVerify;
+
private final String srcUser;
private final String srcPassword;
@@ -113,6 +117,8 @@ public class MigrationOptions {
this.skipInitialization = args.hasOption(OptionParserFactory.SKIP_INIT);
this.skipNameCheck = args.hasOption(OptionParserFactory.SKIP_NAME_CHECK);
this.ignoreMissingBinaries = args.hasOption(OptionParserFactory.IGNORE_MISSING_BINARIES);
+ this.verify = args.hasOption(OptionParserFactory.VERIFY);
+ this.onlyVerify = args.hasOption(OptionParserFactory.ONLY_VERIFY);
this.srcUser = args.getOption(OptionParserFactory.SRC_USER);
this.srcPassword = args.getOption(OptionParserFactory.SRC_USER);
@@ -186,6 +192,14 @@ public class MigrationOptions {
return ignoreMissingBinaries;
}
+ public boolean isVerify() {
+ return verify;
+ }
+
+ public boolean isOnlyVerify() {
+ return onlyVerify;
+ }
+
public String getSrcUser() {
return srcUser;
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java?rev=1766509&r1=1766508&r2=1766509&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java Tue Oct 25 10:54:46 2016
@@ -76,6 +76,10 @@ public class OptionParserFactory {
public static final String INCLUDE_INDEX = "include-index";
+ public static final String VERIFY = "verify";
+
+ public static final String ONLY_VERIFY = "only-verify";
+
public static OptionParser create() {
OptionParser op = new OptionParser();
addUsageOptions(op);
@@ -144,5 +148,7 @@ public class OptionParserFactory {
op.accepts(CACHE_SIZE, "Cache size in MB").withRequiredArg().ofType(Integer.class).defaultsTo(256);
op.accepts(SKIP_INIT, "Skip the repository initialization; only copy data");
op.accepts(SKIP_NAME_CHECK, "Skip the initial phase of testing node name lengths");
+ op.accepts(VERIFY, "After the sidegrade check whether the source repository is exactly the same as destination");
+ op.accepts(ONLY_VERIFY, "Performs only --" + VERIFY + ", without copying content");
}
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java?rev=1766509&r1=1766508&r2=1766509&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java Tue Oct 25 10:54:46 2016
@@ -96,7 +96,6 @@ public class RepeatedRepositorySidegrade
SegmentNodeStore segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
try {
final RepositorySidegrade repositoryUpgrade = new RepositorySidegrade(segmentNodeStore, target);
- repositoryUpgrade.setSkipInitialization(skipInit);
repositoryUpgrade.copy(new RepositoryInitializer() {
@Override
public void initialize(@Nonnull NodeBuilder builder) {