svn commit: r1705059 - in /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl: DiscoveryServiceImpl.java cluster/ClusterViewServiceImpl.java

[st...@apache.org]

Author: stefanegli
Date: Thu Sep 24 13:55:54 2015
New Revision: 1705059

URL: http://svn.apache.org/viewvc?rev=1705059&view=rev
Log:
SLING-5030 : improved log output

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
    sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java?rev=1705059&r1=1705058&r2=1705059&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java Thu Sep 24 13:55:54 2015
@@ -687,7 +687,7 @@ public class DiscoveryServiceImpl implem
             // treat it as being cut off from the entire topology, ie we don't
             // update the announcements but just return
             // the previous oldView marked as !current
-            logger.info("getTopology: undefined cluster view: "+e.getClass().getSimpleName()+": ["+e.getReason()+"] "+e);
+            logger.info("getTopology: undefined cluster view: "+e.getReason()+"] "+e);
             oldView.markOld();
             if (e.getReason()==Reason.ISOLATED_FROM_TOPOLOGY) {
                 if (heartbeatHandler!=null) {

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java?rev=1705059&r1=1705058&r2=1705059&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/ClusterViewServiceImpl.java Thu Sep 24 13:55:54 2015
@@ -124,9 +124,10 @@ public class ClusterViewServiceImpl impl
             if (foundLocal) {
                 return clusterViewImpl;
             } else {
-                logger.info("getClusterView: the existing established view does not incude the local instance ("+getSlingId()+") yet! Assuming isolated mode. "
-                        + "If this occurs at runtime - other than at startup - it could cause a pseudo-network-partition, see SLING-3432. "
-                        + "Consider increasing heartbeatTimeout then!");
+                logger.info("getClusterView: the local instance ("+getSlingId()+") is currently not included in the existing established view! "
+                        + "This is normal at startup, but indicates a pseudo-network-partitioning (SLING-3432) at other times, "
+                        + "in which case increasing the heartbeatTimeout can help, but more importantly the repository-delays/network/clocks must be analyzed. "
+                        + "The local instance will stay in TOPOLOGY_CHANGING or pre _INIT mode until a new vote was successful.");
                 throw new UndefinedClusterViewException(Reason.ISOLATED_FROM_TOPOLOGY, 
                         "established view does not include local instance - isolated");
             }