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 2015/09/18 17:06:25 UTC
svn commit: r1703878 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Author: reschke
Date: Fri Sep 18 15:06:23 2015
New Revision: 1703878
URL: http://svn.apache.org/viewvc?rev=1703878&view=rev
Log:
OAK-3419: ClusterNodeInfo.createInstance - fix cleanup of random entries
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1703878&r1=1703877&r2=1703878&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Fri Sep 18 15:06:23 2015
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.UUID;
import org.apache.jackrabbit.oak.commons.StringUtils;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.util.OakVersion;
import org.slf4j.Logger;
@@ -414,9 +415,11 @@ public class ClusterNodeInfo {
}
String mId = "" + doc.get(MACHINE_ID_KEY);
String iId = "" + doc.get(INSTANCE_ID_KEY);
- if (machineId.startsWith(RANDOM_PREFIX)) {
+ if (mId.startsWith(RANDOM_PREFIX)) {
// remove expired entries with random keys
store.remove(Collection.CLUSTER_NODES, key);
+ LOG.debug("Cleaned up cluster node info for clusterNodeId {} [machineId: {}, leaseEnd: {}]", id, mId,
+ leaseEnd == null ? "n/a" : Utils.timestampToString(leaseEnd));
continue;
}
if (!mId.equals(machineId) ||