Raft core fixes

* Pre-vote task should use the correct term * Schedule append request reset on any append request or install snapshot RPC
mdogan · Feb 12, 2019 · 92b126f7beb94cde8f80b5036802ad415e0b17d3 · 92b126f
1 parent e7a869b
commit 92b126f7beb94cde8f80b5036802ad415e0b17d3
diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/RaftNodeImpl.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/RaftNodeImpl.java
@@ -203,7 +203,7 @@ public void run() {
            logger.fine("Starting raft node: " + localMember + " for " + groupId
                    + " with " + state.memberCount() + " members: " + state.members());
        }
-  
-        raftIntegration.execute(new PreVoteTask(this));
+  
+        raftIntegration.execute(new PreVoteTask(this, 0));
        scheduleLeaderFailureDetection();
    }
@@ -411,11 +411,7 @@ public void send(AppendFailureResponse response, Endpoint target) {
     */
    public void broadcastAppendRequest() {
        for (Endpoint follower : state.remoteMembers()) {
-  
-            try {
-  
-                sendAppendRequest(follower);
-  
-            } catch (Throwable e) {
-  
-                logger.severe(e);
-  
-            }
+  
+            sendAppendRequest(follower);
        }
        updateLastAppendEntriesTimestamp();
    }
@@ -462,6 +458,7 @@ public void sendAppendRequest(Endpoint follower) {
                        + " <= snapshot index: " + raftLog.snapshotIndex());
            }
            followerState.setMaxAppendRequestBackoff();
+  
+            scheduleAppendAckResetTask();
            raftIntegration.send(installSnapshot, follower);
            return;
        }
@@ -514,6 +511,7 @@ public void sendAppendRequest(Endpoint follower) {
        if (setAppendRequestBackoff) {
            followerState.setAppendRequestBackoff();
+  
+            scheduleAppendAckResetTask();
        }
        send(request, follower);
@@ -922,7 +920,7 @@ final void resetLeaderAndStartElection() {
        private void runPreVoteTask() {
            if (state.preCandidateState() == null) {
-  
-                new PreVoteTask(RaftNodeImpl.this).run();
+  
+                new PreVoteTask(RaftNodeImpl.this, state.term()).run();
            }
        }
    }

diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/PreVoteTask.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/PreVoteTask.java
@@ -35,8 +35,11 @@
 */
 public class PreVoteTask extends RaftNodeStatusAwareTask implements Runnable {
-  
-    public PreVoteTask(RaftNodeImpl raftNode) {
+  
+    private int term;
+  
+
+  
+    public PreVoteTask(RaftNodeImpl raftNode, int term) {
        super(raftNode);
+  
+        this.term = term;
    }
    @Override
@@ -46,6 +49,9 @@ protected void innerRun() {
        if (state.leader() != null) {
            logger.fine("No new pre-vote phase, we already have a LEADER: " + state.leader());
            return;
+  
+        } else if (state.term() != term) {
+  
+            logger.fine("No new pre-vote phase for term= " + term + " because of new term: " + state.term());
+  
+            return;
        }
        Collection<Endpoint> remoteMembers = state.remoteMembers();
@@ -73,6 +79,6 @@ protected void innerRun() {
    }
    private void schedulePreVoteTimeout() {
-  
-        raftNode.schedule(new PreVoteTimeoutTask(raftNode), raftNode.getLeaderElectionTimeoutInMillis());
+  
+        raftNode.schedule(new PreVoteTimeoutTask(raftNode, term), raftNode.getLeaderElectionTimeoutInMillis());
    }
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/PreVoteTimeoutTask.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/PreVoteTimeoutTask.java
@@ -27,8 +27,11 @@
 */
 public class PreVoteTimeoutTask extends RaftNodeStatusAwareTask implements Runnable {
-  
-    PreVoteTimeoutTask(RaftNodeImpl raftNode) {
+  
+    private int term;
+  
+
+  
+    PreVoteTimeoutTask(RaftNodeImpl raftNode, int term) {
        super(raftNode);
+  
+        this.term = term;
    }
    @Override
@@ -37,6 +40,6 @@ protected void innerRun() {
            return;
        }
        logger.fine("Pre-vote for term: " + raftNode.state().term() + " has timed out!");
-  
-        new PreVoteTask(raftNode).run();
+  
+        new PreVoteTask(raftNode, term).run();
    }
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/ReplicateTask.java b/hazelcast/src/main/java/com/hazelcast/cp/internal/raft/impl/task/ReplicateTask.java
@@ -85,7 +85,6 @@ public void run() {
        handleRaftGroupCmd(newEntryLogIndex, operation);
        raftNode.broadcastAppendRequest();
-  
-        raftNode.scheduleAppendAckResetTask();
    }
    private boolean verifyRaftNodeStatus() {