홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
3650fc4a 1 parent 90dc8c51

Eliminate possible redundant update when rearranging candidate order in leadership manager 

Change-Id: Id76345ab827c4b6f55114f3afacdbc334092818a
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
......@@ -2,6 +2,7 @@ package org.onosproject.store.consistent.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
......@@ -350,8 +351,9 @@ public class DistributedLeadershipManager implements LeadershipService {
@Override
public boolean makeTopCandidate(String path, NodeId nodeId) {
Versioned<List<NodeId>> newCandidates = candidateMap.computeIf(path,
candidates -> (candidates != null && candidates.contains(nodeId)) ||
(candidates != null && Objects.equals(nodeId, candidates.get(LEADER_CANDIDATE_POS))),
candidates -> candidates != null &&
candidates.contains(nodeId) &&
!nodeId.equals(Iterables.getFirst(candidates, null)),
(topic, candidates) -> {
List<NodeId> updatedCandidates = new ArrayList<>(candidates.size());
updatedCandidates.add(nodeId);
......