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

[st...@apache.org]

Author: stefanegli
Date: Tue Oct  6 15:02:25 2015
New Revision: 1707069

URL: http://svn.apache.org/viewvc?rev=1707069&view=rev
Log:
SLING-5094 related: early committing some minor logging changes

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

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=1707069&r1=1707068&r2=1707069&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 Tue Oct  6 15:02:25 2015
@@ -125,8 +125,8 @@ public class ClusterViewServiceImpl impl
                 return clusterViewImpl;
             } else {
                 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. "
+                        + "This is normal at startup. At other times is pseudo-network-partitioning is an indicator for repository/network-delays or clocks-out-of-sync (SLING-3432). "
+                        + "(increasing the heartbeatTimeout can help as a workaround too) "
                         + "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");

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingView.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingView.java?rev=1707069&r1=1707068&r2=1707069&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingView.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingView.java Tue Oct  6 15:02:25 2015
@@ -311,6 +311,7 @@ public class VotingView extends View {
         final ModifiableValueMap memberMap = memberResource.adaptTo(ModifiableValueMap.class);
 
         if (vote == null) {
+            logger.trace("vote: removing vote (vote==null)");
             memberMap.remove("vote");
         } else {
             boolean shouldVote = true;