Merge pull request alibaba#361 from alibaba/hotfix_decide_leader_bug

Fix alibaba#357
JAVACodeFarmer · Nov 28, 2018 · 7974578 · 7974578
2 parents ccea92e + 44cb206
commit 7974578
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/raft/PeerSet.java b/naming/src/main/java/com/alibaba/nacos/naming/raft/PeerSet.java
@@ -120,17 +120,22 @@ public RaftPeer decideLeader(RaftPeer candidate) {
         peers.put(candidate.ip, candidate);
 
         SortedBag ips = new TreeBag();
+        int maxApproveCount = 0;
+        String maxApprovePeer = null;
         for (RaftPeer peer : peers.values()) {
             if (StringUtils.isEmpty(peer.voteFor)) {
                 continue;
             }
 
             ips.add(peer.voteFor);
+            if (ips.getCount(peer.voteFor) > maxApproveCount) {
+                maxApproveCount = ips.getCount(peer.voteFor);
+                maxApprovePeer = peer.voteFor;
+            }
         }
 
-        String first = (String) ips.last();
-        if (ips.getCount(first) >= majorityCount()) {
-            RaftPeer peer = peers.get(first);
+        if (maxApproveCount >= majorityCount()) {
+            RaftPeer peer = peers.get(maxApprovePeer);
             peer.state = RaftPeer.State.LEADER;
 
             if (!Objects.equals(leader, peer)) {