svn commit: r1799191 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

[to...@apache.org]

Author: tomekr
Date: Mon Jun 19 12:25:36 2017
New Revision: 1799191

URL: http://svn.apache.org/viewvc?rev=1799191&view=rev
Log:
OAK-6360: Failed to retrieve previously indexed checkpoint in composite node store

Added extra diagnostic info for the checkpoint migration in oak-upgrade

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

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=1799191&r1=1799190&r2=1799191&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 Mon Jun 19 12:25:36 2017
@@ -354,6 +354,8 @@ public class RepositorySidegrade {
         NodeBuilder targetRoot = target.getRoot().builder();
         for (CheckpointRetriever.Checkpoint checkpoint : checkpoints) {
             NodeState checkpointRoot = source.retrieve(checkpoint.getName());
+            Map<String, String> checkpointInfo = source.checkpointInfo(checkpoint.getName());
+
             boolean tracePaths;
             if (previousRoot == EmptyNodeState.EMPTY_NODE) {
                 LOG.info("Migrating first checkpoint: {}", checkpoint.getName());
@@ -362,6 +364,7 @@ public class RepositorySidegrade {
                 LOG.info("Applying diff to {}", checkpoint.getName());
                 tracePaths = false;
             }
+            LOG.info("Checkpoint expiry time: {}, metadata: {}", checkpoint.getExpiryTime(), checkpointInfo);
 
             NodeState currentRoot = wrapSource(checkpointRoot, tracePaths, true);
             NodeState baseRoot = previousRoot == EmptyNodeState.EMPTY_NODE ? previousRoot : wrapSource(previousRoot, false, true);
@@ -370,7 +373,6 @@ public class RepositorySidegrade {
             target.merge(targetRoot, EmptyHook.INSTANCE, CommitInfo.EMPTY);
             previousRoot = checkpointRoot;
 
-            Map<String, String> checkpointInfo = source.checkpointInfo(checkpoint.getName());
             String newCheckpointName = target.checkpoint(checkpoint.getExpiryTime() - System.currentTimeMillis(), checkpointInfo);
             if (checkpointInfo.containsKey("name")) {
                 nameToRevision.put(checkpointInfo.get("name"), newCheckpointName);