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

simulator: fix some logic bugs #5703

Merged
merged 1 commit into from
Nov 15, 2022
Merged

simulator: fix some logic bugs #5703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions tools/pd-simulator/simulator/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func changePeerToOperator(region *core.RegionInfo, cp *pdpb.ChangePeer) (operato
peer := cp.GetPeer()
switch cp.GetChangeType() {
case eraftpb.ConfChangeType_AddNode:
if region.GetPeer(peer.GetId()) != nil {
if region.GetStoreLearner(peer.GetStoreId()) != nil {
return &promoteLearner{peer: peer}, fmt.Sprintf("promote learner %+v for region %d", peer, regionID)
}
return &addPeer{
Expand All @@ -149,7 +149,7 @@ func changePeerToOperator(region *core.RegionInfo, cp *pdpb.ChangePeer) (operato
receivingStat: newSnapshotState(region.GetApproximateSize(), receive),
}, fmt.Sprintf("add voter %+v for region %d", peer, regionID)
case eraftpb.ConfChangeType_AddLearnerNode:
if region.GetPeer(peer.GetId()) != nil {
if region.GetStoreVoter(peer.GetStoreId()) != nil {
return &demoteVoter{peer: peer}, fmt.Sprintf("demote voter %+v for region %d", peer, regionID)
}
return &addPeer{
Expand Down Expand Up @@ -211,6 +211,7 @@ func (t *Task) Step(engine *RaftEngine) (isFinished bool) {
newRegion, t.isFinished = t.tick(engine, region)

if newRegion != nil {
t.epoch = newRegion.GetRegionEpoch()
engine.SetRegion(newRegion)
engine.recordRegionChange(newRegion)
}
Expand Down Expand Up @@ -374,7 +375,7 @@ func (cl *changePeerV2Leave) tick(engine *RaftEngine, region *core.RegionInfo) (
case metapb.PeerRole_IncomingVoter:
opts = append(opts, checkAndCreateChangePeerOption(engine, region, peer, metapb.PeerRole_IncomingVoter, metapb.PeerRole_Voter)...)
case metapb.PeerRole_DemotingVoter:
opts = append(opts, checkAndCreateChangePeerOption(engine, region, peer, metapb.PeerRole_IncomingVoter, metapb.PeerRole_Voter)...)
opts = append(opts, checkAndCreateChangePeerOption(engine, region, peer, metapb.PeerRole_DemotingVoter, metapb.PeerRole_Learner)...)
}
}
if len(opts) < 4 {
Expand Down Expand Up @@ -529,7 +530,7 @@ func processSnapshot(n *Node, stat *snapshotStat) bool {

// store should Generate/Receive snapshot by chunk size.
// todo: the process of snapshot is single thread, the later snapshot task must wait the first one.
for n.limiter.AllowN(int(chunkSize)) {
for stat.remainSize > 0 && n.limiter.AllowN(chunkSize) {
stat.remainSize -= chunkSize
}

Expand Down