Skip to content

Leadership transfer gaps #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhiaayachi merged 2 commits into from
Feb 2, 2022
Merged

Leadership transfer gaps #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b28506
setLeadershipTransferInProgress before starting the transfer go routi…
Jan 25, 2022
bce8cba
do not transition to follower state in a middle of a leadership transfer
Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions raft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,10 @@ func (r *Raft) leaderLoop() {
// based on the current config value.
lease := time.After(r.config().LeaderLeaseTimeout)

// This would unset leadershipTransferInProgress
// in case it was set during the loop
defer func() { r.setLeadershipTransferInProgress(false) }()

for r.getState() == Leader {
select {
case rpc := <-r.rpcCh:
Expand Down Expand Up @@ -644,7 +648,7 @@ func (r *Raft) leaderLoop() {
doneCh <- fmt.Errorf("cannot find replication state for %v", id)
continue
}

r.setLeadershipTransferInProgress(true)
go r.leadershipTransfer(*id, *address, state, stopCh, doneCh)

case <-r.leaderState.commitCh:
Expand Down Expand Up @@ -847,10 +851,6 @@ func (r *Raft) leadershipTransfer(id ServerID, address ServerAddress, repl *foll
default:
}

// Step 1: set this field which stops this leader from responding to any client requests.
r.setLeadershipTransferInProgress(true)
defer func() { r.setLeadershipTransferInProgress(false) }()

for atomic.LoadUint64(&repl.nextIndex) <= r.getLastIndex() {
err := &deferError{}
err.init()
Expand Down Expand Up @@ -1304,7 +1304,7 @@ func (r *Raft) appendEntries(rpc RPC, a *AppendEntriesRequest) {

// Increase the term if we see a newer one, also transition to follower
// if we ever get an appendEntries call
if a.Term > r.getCurrentTerm() || r.getState() != Follower {
if a.Term > r.getCurrentTerm() || (r.getState() != Follower && !r.candidateFromLeadershipTransfer) {
// Ensure transition to follower
r.setState(Follower)
r.setCurrentTerm(a.Term)
Expand Down