홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ayaka Koshibe
Committed by Gerrit Code Review
4a3c2396 1 parent ca540c39

some fixes to check for stale locks and active members 

Change-Id: Ia3fc4ab8406dadcecc5d718e905a951f77a807cf
Inline Side-by-side
Showing 1 changed file with 6 additions and 5 deletions
......@@ -15,8 +15,6 @@ import org.apache.felix.scr.annotations.Service;
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 com.google.common.base.Preconditions.checkArgument;
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 @@ public class DistributedLeadershipManager implements LeadershipService {
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 @@ public class DistributedLeadershipManager implements LeadershipService {
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();
......