svn commit: r1743182 - in /jackrabbit/oak/branches/1.4: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java

[reschke]

Author: reschke
Date: Tue May 10 13:48:46 2016
New Revision: 1743182

URL: http://svn.apache.org/viewvc?rev=1743182&view=rev
Log:
OAK-4163: LastRevRecoveryAgent: improve startup diagnostics (ported to 1.4)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 13:48:46 2016
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737998,1738004,1738775,1738963,1739894,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737998,1738004,1738775,1738963,1739894,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java?rev=1743182&r1=1743181&r2=1743182&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
 Tue May 10 13:48:46 2016
@@ -90,16 +90,21 @@ public class LastRevRecoveryAgent {
 
                 // start time is the _lastRev timestamp of this cluster node
                 final long startTime;
+                final String reason;
                 //lastRev can be null if other cluster node did not got
                 //chance to perform lastRev rollup even once
                 if (lastRev != null) {
                     startTime = lastRev.getTimestamp();
+                    reason = "lastRev: " + lastRev.toString();
                 } else {
                     startTime = leaseEnd - leaseTime - asyncDelay;
+                    reason = String.format(
+                            "no lastRev for root, using timestamp based on 
leaseEnd %d - leaseTime %d - asyncDelay %d", leaseEnd,
+                            leaseTime, asyncDelay);
                 }
 
-                log.info("Recovering candidates modified after: [{}] for 
clusterId [{}]",
-                        Utils.timestampToString(startTime), clusterId);
+                log.info("Recovering candidates modified after: [{}] for 
clusterId [{}] [{}]",
+                        Utils.timestampToString(startTime), clusterId, reason);
 
                 return recoverCandidates(clusterId, startTime);
             }