Election scheduler should be cancelled after cluster state publication

Signed-off-by: Sooraj Sinha <[email protected]>
opensearch-project · Jan 2, 2024 · 61a266a · 61a266a
1 parent 5ccd134
commit 61a266a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
@@ -472,11 +472,18 @@ private static Optional<Join> joinWithDestination(Optional<Join> lastJoin, Disco
     }
 
     private void closePrevotingAndElectionScheduler() {
+        closePrevoting();
+        closeElectionScheduler();
+    }
+
+    private void closePrevoting() {
         if (prevotingRound != null) {
             prevotingRound.close();
             prevotingRound = null;
         }
+    }
 
+    private void closeElectionScheduler() {
         if (electionScheduler != null) {
             electionScheduler.close();
             electionScheduler = null;
@@ -724,7 +731,7 @@ void becomeLeader(String method) {
         lastKnownLeader = Optional.of(getLocalNode());
         peerFinder.deactivate(getLocalNode());
         clusterFormationFailureHelper.stop();
-        closePrevotingAndElectionScheduler();
+        closePrevoting();
         preVoteCollector.update(getPreVoteResponse(), getLocalNode());
 
         assert leaderChecker.leader() == null : leaderChecker.leader();
@@ -1447,13 +1454,12 @@ protected void onFoundPeersUpdated() {
                     foundPeers.forEach(expectedVotes::addVote);
                     expectedVotes.addVote(Coordinator.this.getLocalNode());
                     final boolean foundQuorum = coordinationState.get().isElectionQuorum(expectedVotes);
-
                     if (foundQuorum) {
                         if (electionScheduler == null) {
                             startElectionScheduler();
                         }
                     } else {
-                        closePrevotingAndElectionScheduler();
+                        closePrevoting();
                     }
                 }
             }
@@ -1735,6 +1741,7 @@ public void onSuccess(String source) {
                                     logIncompleteNodes(Level.WARN);
                                 }
                                 cancelTimeoutHandlers();
+                                closeElectionScheduler();
                                 ackListener.onNodeAck(getLocalNode(), null);
                                 publishListener.onResponse(null);
                             }