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 re...@apache.org on 2016/04/01 11:40:32 UTC
svn commit: r1737334 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
Author: reschke
Date: Fri Apr 1 09:40:32 2016
New Revision: 1737334
URL: http://svn.apache.org/viewvc?rev=1737334&view=rev
Log:
OAK-4163: LastRevRecoveryAgent: improve startup diagnostics
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java?rev=1737334&r1=1737333&r2=1737334&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java Fri Apr 1 09:40:32 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);
}