Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions raft.go
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,10 @@ func (r *Raft) leaderLoop() {
doneCh <- fmt.Errorf("cannot find replication state for %v", id)
continue
}
if !hasVote(r.configurations.latest, *id) {
doneCh <- fmt.Errorf("cannot transfer leadership to non-voter: %v", id)
continue
}
r.setLeadershipTransferInProgress(true)
go r.leadershipTransfer(*id, *address, state, stopCh, doneCh)

Expand Down
24 changes: 24 additions & 0 deletions raft_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2656,6 +2656,30 @@ func TestRaft_LeadershipTransferIgnoresNonvoters(t *testing.T) {
}
}

func TestRaft_LeadershipTransferToNonvoterDoesNotDisruptLeader(t *testing.T) {
c := MakeCluster(2, t, nil)
defer c.Close()

leader := c.Leader()
follower := c.Followers()[0]

demoteFuture := leader.DemoteVoter(follower.localID, 0, 0)
require.NoError(t, demoteFuture.Error())

originalLeaderID := leader.localID
originalTerm := leader.getCurrentTerm()

future := leader.LeadershipTransferToServer(follower.localID, follower.localAddr)
require.Error(t, future.Error())

// A transfer request to a non-voter should fail without forcing unnecessary
// term churn or leader changes.
time.Sleep(3 * c.propagateTimeout)
stableLeader := c.Leader()
require.Equal(t, originalLeaderID, stableLeader.localID)
require.Equal(t, originalTerm, stableLeader.getCurrentTerm())
}

func TestRaft_LeadershipTransferStopRightAway(t *testing.T) {
r := Raft{leaderState: leaderState{}, logger: hclog.New(nil)}
r.setupLeaderState()
Expand Down
Loading