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.

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

scheduler: skip evict-leader-scheduler when setting schedule deny label #8303

Merged
merged 31 commits into from
Jun 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
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
Next Next commit
skip evict-leader-scheduler
Signed-off-by: okJiang <819421878@qq.com>
  • Loading branch information
okJiang committed Jun 17, 2024
commit 844aa846697ad2f0833eb470e66ddd80230e661b
4 changes: 4 additions & 0 deletions client/http/interface.go
Original file line number Diff line number Diff line change
@@ -81,6 +81,10 @@ type Client interface {
DeletePlacementRuleGroupByID(context.Context, string) error
GetAllRegionLabelRules(context.Context) ([]*LabelRule, error)
GetRegionLabelRulesByIDs(context.Context, []string) ([]*LabelRule, error)
// `SetRegionLabelRule` sets the label rule for a region.
// When you set a label rule(deny scheduler),
// 1. All of the scheduler will be disabled expect the evict-leader-scheduler.
// 2. Merge-checker will be disabled, which means those regions will not be merged.
SetRegionLabelRule(context.Context, *LabelRule) error
PatchRegionLabelRules(context.Context, *LabelRulePatch) error
/* Scheduling-related interfaces */
3 changes: 2 additions & 1 deletion pkg/schedule/schedulers/scheduler_controller.go
Original file line number Diff line number Diff line change
@@ -486,7 +486,8 @@ retry:
if labelMgr == nil {
continue
}
if labelMgr.ScheduleDisabled(region) {
_, ok := s.Scheduler.(*evictLeaderScheduler)
if labelMgr.ScheduleDisabled(region) && !ok {
denySchedulersByLabelerCounter.Inc()
continue retry
}