Author: chetanm
Date: Sat May 23 09:51:21 2015
New Revision: 1681304
URL: http://svn.apache.org/r1681304
Log:
OAK-2657 - Repository Upgrade could shut down the source repository early
Merging 1681282
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 09:51:21 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680805-1680806,1680903
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680805-1680806,1680903,1681282
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1681304&r1=1681303&r2=1681304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Sat May 23 09:51:21 2015
@@ -137,6 +137,8 @@ public class RepositoryUpgrade {
private boolean copyBinariesByReference = false;
+ private boolean earlyShutdown = false;
+
private List<CommitHook> customCommitHooks = null;
/**
@@ -191,6 +193,14 @@ public class RepositoryUpgrade {
this.copyBinariesByReference = copyBinariesByReference;
}
+ public boolean isEarlyShutdown() {
+ return earlyShutdown;
+ }
+
+ public void setEarlyShutdown(boolean earlyShutdown) {
+ this.earlyShutdown = earlyShutdown;
+ }
+
/**
* Returns the list of custom CommitHooks to be applied before the final
* type validation, reference and indexing hooks.
@@ -329,7 +339,7 @@ public class RepositoryUpgrade {
createIndexEditorProvider()
)));
- target.merge(builder, new LoggingCompositeHook(hooks),
CommitInfo.EMPTY);
+ target.merge(builder, new LoggingCompositeHook(hooks, source,
earlyShutdown), CommitInfo.EMPTY);
logger.debug("Repository upgrade completed.");
} catch (Exception e) {
throw new RepositoryException("Failed to copy content", e);
@@ -743,9 +753,15 @@ public class RepositoryUpgrade {
private static class LoggingCompositeHook implements CommitHook {
private final Collection<CommitHook> hooks;
+ private boolean started = false;
+ private final boolean earlyShutdown;
+ private final RepositoryContext source;
- public LoggingCompositeHook(Collection<CommitHook> hooks) {
+ public LoggingCompositeHook(Collection<CommitHook> hooks,
+ RepositoryContext source, boolean earlyShutdown) {
this.hooks = hooks;
+ this.earlyShutdown = earlyShutdown;
+ this.source = source;
}
@Nonnull
@@ -753,6 +769,11 @@ public class RepositoryUpgrade {
public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) throws CommitFailedException {
NodeState newState = after;
Stopwatch watch = Stopwatch.createStarted();
+ if (earlyShutdown && !started) {
+ logger.info("Shutting down source repository.");
+ source.getRepository().shutdown();
+ started = true;
+ }
for (CommitHook hook : hooks) {
logger.info("Processing commit via {}", hook);
newState = hook.processCommit(before, newState, info);
