Skip to content
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

Jump to bottom

operator: When replacing-down-peer, it should not stop at the step of leave-joint-state #5789

Merged
merged 3 commits into from
Dec 19, 2022
Merged

operator: When replacing-down-peer, it should not stop at the step of leave-joint-state #5789

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db551b
operator: When replacing-down-peer, it should not stop at the step of…
HunDunDM Dec 16, 2022
8bb7c99
tiny fix
HunDunDM Dec 16, 2022
3066c18
Merge branch 'master' into fix-5788
ti-chi-bot Dec 19, 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
2 changes: 1 addition & 1 deletion server/schedule/operator/step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ func (dv DemoteVoter) IsFinish(region *core.RegionInfo) bool {
log.Warn("obtain unexpected peer", zap.String("expect", dv.String()), zap.Uint64("obtain-learner", peer.GetId()))
return false
}
return region.GetPendingLearner(peer.GetId()) == nil
return peer.GetId() == dv.PeerID
}
return false
}
Expand Down
7 changes: 7 additions & 0 deletions server/schedule/operator/step_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,5 +569,12 @@ func (suite *operatorStepTestSuite) check(step OpStep, desc string, testCases []
err := step.CheckInProgress(suite.cluster, region)
testCase.CheckInProgress(err)
_ = step.GetCmd(region, true)

if _, ok := step.(ChangePeerV2Leave); ok {
// Ref https://github.com/tikv/pd/issues/5788
pendingPeers := region.GetLearners()
region = region.Clone(core.WithPendingPeers(pendingPeers))
suite.Equal(testCase.IsFinish, step.IsFinish(region))
}
}
}