raft: set electionElapsed to electionTimeout in defortify() regardless of state #136025
+19
−14
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we use to set electionElapsed to electionTimeout inside defortify() only when we are not the leader. We did this as an extra defense because we didn't want to increment the electionTimeout when we are the leader. However, there is no need for this extra complexity since in all cases where we call defortify when we are the leader, we either immediately step down (which resets the electionElapsed to 0), or we are okay performing a checkQuorum (in the case where a leader receive a MsgPreVote from a higher term while it's not in leader-lease)
Epic: None
Release note: None