commit 4a3c239665bfa33f1111f2e4c70e73c3be542009
author Ayaka Koshibe <ayaka@onlab.us> Wed Apr 22 18:03:13 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Apr 23 06:52:59 2015 +0000
tree 87683d308aeda3cd6d047f93f28222c7ef901bab
parent ca540c39d4df726a4d44c28e2d5a0d5269583e50

some fixes to check for stale locks and active members

Change-Id: Ia3fc4ab8406dadcecc5d718e905a951f77a807cf

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
index 1a659ef..fe702ee 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
@@ -15,8 +15,6 @@
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.onlab.util.KryoNamespace;
 import org.onosproject.cluster.ClusterService;
-import org.onosproject.cluster.ControllerNode;
-import org.onosproject.cluster.ControllerNode.State;
 import org.onosproject.cluster.Leadership;
 import org.onosproject.cluster.LeadershipEvent;
 import org.onosproject.cluster.LeadershipEventListener;
@@ -51,6 +49,9 @@
 import static org.onlab.util.Tools.groupedThreads;
 import static org.slf4j.LoggerFactory.getLogger;
 
+import static org.onosproject.cluster.ControllerNode.State.ACTIVE;
+import static org.onosproject.cluster.ControllerNode.State.INACTIVE;
+
 /**
  * Distributed Lock Manager implemented on top of ConsistentMap.
  * <p>
@@ -286,7 +287,7 @@
         Versioned<List<NodeId>> candidates = candidateMap.get(path);
         if (candidates != null) {
             List<NodeId> activeNodes = candidates.value().stream()
-                              .filter(n -> clusterService.getState(n) == State.ACTIVE)
+                              .filter(n -> clusterService.getState(n) == ACTIVE)
                               .collect(Collectors.toList());
             if (localNodeId.equals(activeNodes.get(LEADER_CANDIDATE_POS))) {
                 leaderLockAttempt(path, candidates.value());
@@ -491,8 +492,8 @@
         try {
             leaderMap.entrySet()
                 .stream()
-                .filter(e -> clusterService.getState(e.getValue().value()) == ControllerNode.State.INACTIVE)
-                .filter(e -> localNodeId.equals(e.getValue().value()) && !activeTopics.contains(e.getKey()))
+                .filter(e -> clusterService.getState(e.getValue().value()) == INACTIVE)
+                .filter(e -> activeTopics.contains(e.getKey()))
                 .forEach(entry -> {
                     String path = entry.getKey();
                     NodeId nodeId = entry.getValue().value();