svn commit: r1704285 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: ClusterNodeInfo.java DocumentNodeStore.java

[re...@apache.org]

Author: reschke
Date: Mon Sep 21 12:28:22 2015
New Revision: 1704285

URL: http://svn.apache.org/viewvc?rev=1704285&view=rev
Log:
OAK-3425: Improve DocumentNodeStore startup/shutdown diagnostics

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.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=1704285&r1=1704284&r2=1704285&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 Mon Sep 21 12:28:22 2015
@@ -170,6 +170,11 @@ public class ClusterNodeInfo {
     private static final int MAX_RETRY_SLEEPS_BEFORE_LEASE_FAILURE = 5;
 
     /**
+     * The Oak version.
+     */
+    private static final String OAK_VERSION = OakVersion.getVersion();
+
+    /**
      * The number of milliseconds for a lease (2 minute by default, and
      * initially).
      */
@@ -370,7 +375,7 @@ public class ClusterNodeInfo {
             update.set(INFO_KEY, clusterNode.toString());
             update.set(STATE, clusterNode.state.name());
             update.set(REV_RECOVERY_LOCK, clusterNode.revRecoveryLock.name());
-            update.set(OAK_VERSION_KEY, OakVersion.getVersion());
+            update.set(OAK_VERSION_KEY, OAK_VERSION);
 
             final boolean success;
             if (clusterNode.newEntry) {
@@ -704,7 +709,8 @@ public class ClusterNodeInfo {
                 "uuid: " + uuid + ",\n" +
                 "readWriteMode: " + readWriteMode + ",\n" +
                 "state: " + state + ",\n" +
-                "revLock: " + revRecoveryLock;
+                "revLock: " + revRecoveryLock + ",\n" +
+                "oakVersion: " + OAK_VERSION;
     }
 
     /**

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1704285&r1=1704284&r2=1704285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Mon Sep 21 12:28:22 2015
@@ -542,7 +542,8 @@ public final class DocumentNodeStore
         }
 
         this.mbean = createMBean();
-        LOG.info("Initialized DocumentNodeStore with clusterNodeId: {}", clusterId);
+        LOG.info("Initialized DocumentNodeStore with clusterNodeId: {} ({})", clusterId,
+                getClusterNodeInfoDisplayString());
     }
 
     /**
@@ -553,6 +554,9 @@ public final class DocumentNodeStore
     }
 
     public void dispose() {
+        LOG.info("Starting disposal of DocumentNodeStore with clusterNodeId: {} ({})", clusterId,
+                getClusterNodeInfoDisplayString());
+
         if (isDisposed.getAndSet(true)) {
             // only dispose once
             return;
@@ -614,6 +618,10 @@ public final class DocumentNodeStore
         LOG.info("Disposed DocumentNodeStore with clusterNodeId: {}", clusterId);
     }
 
+    private String getClusterNodeInfoDisplayString() {
+        return clusterNodeInfo == null ? "no cluster node info" : clusterNodeInfo.toString().replaceAll("[\r\n\t]", " ").trim();
+    }
+
     Revision setHeadRevision(@Nonnull Revision newHead) {
         checkArgument(!newHead.isBranch());
         Revision previous = headRevision;