commit 79923c2d79c70dcf642c2c4bd24cfbf2501d0090
author Ivan Andika <36403683+ivandika3@users.noreply.github.com> Thu Jan 25 01:14:49 2024 +0800
committer GitHub <noreply@github.com> Wed Jan 24 09:14:49 2024 -0800
tree 0f8f2470241f757495b42fd01ba6e7b2b5fcebf2
parent ea1341b05dbaedb7b9775fa870522bf1de052a0e

RATIS-2008. Follower should recognize candidate if the candidate is the same peer as the current valid leader (#1024)

ratis-server/src/main/java/org/apache/ratis/server/impl/VoteContext.java

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/VoteContext.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/VoteContext.java
index 6375d65..3ba0c0e 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/VoteContext.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/VoteContext.java
@@ -102,8 +102,10 @@
     if (info.isFollower()) {
       final RaftPeerId leader = impl.getState().getLeaderId();
       if (leader != null
+          && !leader.equals(candidateId)
           && impl.getRole().getFollowerState().map(FollowerState::isCurrentLeaderValid).orElse(false)) {
-        return reject("this server is a follower and still has a valid leader " + leader);
+        return reject("this server is a follower and still has a valid leader " + leader
+            + " different than the candidate " + candidateId);
       }
     }
     return true;