scheduler: add leader verify in balance-region scheduler #2966
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Song Gao <disxiaofei@163.com>
disksing
reviewed
Sep 16, 2020
Signed-off-by: Song Gao <disxiaofei@163.com>
Signed-off-by: Song Gao <disxiaofei@163.com>
Yisaer
added
needs-cherry-pick-release-4.0
rleungx
reviewed
Sep 16, 2020
Signed-off-by: Song Gao <disxiaofei@163.com>
HunDunDM
reviewed
Sep 16, 2020
pkg/mock/mockcluster/mockcluster.go
Outdated
| @@ -535,7 +540,7 @@ func (mc *Cluster) UpdateStoreStatus(id uint64) { | |||
| } | |||
|
|
|||
| func (mc *Cluster) newMockRegionInfo(regionID uint64, leaderStoreID uint64, followerStoreIDs ...uint64) *core.RegionInfo { | |||
| return mc.MockRegionInfo(regionID, leaderStoreID, followerStoreIDs, []uint64{}, nil) | |||
| return mc.MockRegionInfo(regionID, &leaderStoreID, followerStoreIDs, []uint64{}, nil) | |||
There was a problem hiding this comment.
When does nil need to be passed in here? In addition, 0 can also mean that store does not exist.
There was a problem hiding this comment.
I think check 0 is better.
Signed-off-by: Song Gao <disxiaofei@163.com>
Signed-off-by: Song Gao <disxiaofei@163.com>
disksing
approved these changes
Sep 17, 2020
HunDunDM
reviewed
Sep 17, 2020
pkg/mock/mockcluster/mockcluster.go
Outdated
| @@ -583,8 +584,12 @@ func (mc *Cluster) MockRegionInfo(regionID uint64, leaderStoreID uint64, | |||
| EndKey: []byte(fmt.Sprintf("%20d", regionID+1)), | |||
| RegionEpoch: epoch, | |||
| } | |||
| leader, _ := mc.AllocPeer(leaderStoreID) | |||
| region.Peers = []*metapb.Peer{leader} | |||
| region.Peers = []*metapb.Peer{} | |||
There was a problem hiding this comment.
Suggested change
| region.Peers = []*metapb.Peer{} |
lhy1024
reviewed
Sep 18, 2020
server/schedulers/balance_region.go
Outdated
| @@ -173,6 +173,12 @@ func (s *balanceRegionScheduler) Schedule(cluster opt.Cluster) []*operator.Opera | |||
| schedulerCounter.WithLabelValues(s.GetName(), "region-hot").Inc() | |||
| continue | |||
| } | |||
| // Check region whether have leader | |||
| if region.GetLeader() == nil { | |||
| log.Debug("region have no leader", zap.String("scheduler", s.GetName()), zap.Uint64("region-id", region.GetID())) | |||
Signed-off-by: Song Gao <disxiaofei@163.com>
lhy1024
approved these changes
Sep 18, 2020
ti-srebot
added
status/LGT2
ti-srebot
approved these changes
Sep 18, 2020
|
/merge |
|
@Yisaer Oops! auto merge is restricted to Committers of the SIG.See the corresponding SIG page for more information. Related SIG: scheduling(slack). |
|
/merge |
ti-srebot
added
the
status/can-merge
|
/run-all-tests |
ti-srebot
pushed a commit
to ti-srebot/pd
that referenced
this pull request
Sep 18, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-4.0 in PR #2994 |
lhy1024
added a commit
that referenced
this pull request
Sep 21, 2020
* cherry pick #2966 to release-4.0 Signed-off-by: ti-srebot <ti-srebot@pingcap.com> * fix conflict Signed-off-by: Song Gao <disxiaofei@163.com> * fix test Signed-off-by: Song Gao <disxiaofei@163.com> Co-authored-by: Song Gao <disxiaofei@163.com> Co-authored-by: lhy1024 <admin@liudos.us>
JmPotato
pushed a commit
to JmPotato/pd
that referenced
this pull request
Feb 5, 2024
Signed-off-by: Song Gao <disxiaofei@163.com>
JmPotato
added a commit
that referenced
this pull request
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Song Gao disxiaofei@163.com
What problem does this PR solve?
If the region have no leader during balance-region, it will pause PD panic and restart over and over.
What is changed and how it works?
Check region leader before balance region. If it has no leader, the balance for this region would be skipped.
Check List
Tests
Related changes
Release note
balance-regionenabled.