Skip to content

scheduler: use right check for evict/grant leader scheduler#8758

Merged
ti-chi-bot[bot] merged 3 commits intotikv:release-7.5from
okJiang:7.5-evict-leader-donot-work
Nov 5, 2024
Merged

scheduler: use right check for evict/grant leader scheduler#8758
ti-chi-bot[bot] merged 3 commits intotikv:release-7.5from
okJiang:7.5-evict-leader-donot-work

Conversation

@okJiang
Copy link
Copy Markdown
Member

@okJiang okJiang commented Oct 31, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: Ref #8756

What is changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test

If I run the ut in release-7.1 branch, it will report error

--- FAIL: TestEvictLeaderScheduler (3.42s)
    /Users/jiangxianjie/Code/okjiang/pd/tests/pdctl/scheduler/scheduler_test.go:638: 
        	Error Trace:	/Users/jiangxianjie/Code/okjiang/pd/tests/pdctl/scheduler/scheduler_test.go:638
        	Error:      	"Failed! [400] \"[PD:scheduler:ErrSchedulerConfig]wrong scheduler config id\"\n\n" does not contain "Success!"
        	Test:       	TestEvictLeaderScheduler

Release note

Fix an issue that the grant/evict-leader-scheduler doesn't work when create them twice with the same store-id

@okJiang
fix wrong check
97fb08a 
Signed-off-by: okJiang <819421878@qq.com>
@ti-chi-bot ti-chi-bot Bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has signed the dco. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Oct 31, 2024
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Nov 5, 2024

/retest

@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Nov 5, 2024

/cherry-pick release-7.1

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Nov 5, 2024

@okJiang: once the present PR merges, I will cherry-pick it on top of release-7.1 in the new PR and assign it to you.

Details

In response to this:

/cherry-pick release-7.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@okJiang
add an ut
c7af65f 
Signed-off-by: okJiang <819421878@qq.com>
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Nov 5, 2024

/retest

@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Nov 5, 2024

/cc @rleungx @lhy1024

@ti-chi-bot ti-chi-bot Bot requested review from lhy1024 and rleungx November 5, 2024 08:19
@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Nov 5, 2024
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot Bot commented Nov 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lhy1024, rleungx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot Bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 5, 2024
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot Bot commented Nov 5, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-11-05 08:23:49.298923315 +0000 UTC m=+942942.138078853: ☑️ agreed by rleungx.
  • 2024-11-05 08:28:07.358570093 +0000 UTC m=+943200.197725639: ☑️ agreed by lhy1024.

@ti-chi-bot ti-chi-bot Bot merged commit 10e4889 into tikv:release-7.5 Nov 5, 2024
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Nov 5, 2024

@okJiang: new pull request created to branch release-7.1: #8773.

Details

In response to this:

/cherry-pick release-7.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot mentioned this pull request Nov 5, 2024
Merged
@okJiang okJiang deleted the 7.5-evict-leader-donot-work branch November 5, 2024 08:42
ti-chi-bot Bot pushed a commit that referenced this pull request Nov 5, 2024
@ti-chi-bot @okJiang
scheduler: use right check for evict/grant leader scheduler (#8758) (#…
a385ada 
…8773)

ref #8756

Signed-off-by: okJiang <819421878@qq.com>

Co-authored-by: okJiang <819421878@qq.com>
@okJiang
Copy link
Copy Markdown
Member Author

okJiang commented Nov 6, 2024

/cherry-pick release-8.1
/cherry-pick release-6.5

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Nov 6, 2024
@okJiang @ti-chi-bot
This is an automated cherry-pick of tikv#8758
7170cc4 
ref tikv#8756

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Nov 6, 2024

@okJiang: new pull request created to branch release-6.5: #8778.

Details

In response to this:

/cherry-pick release-8.1
/cherry-pick release-6.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot mentioned this pull request Nov 6, 2024
Merged
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Nov 6, 2024
@okJiang @ti-chi-bot
This is an automated cherry-pick of tikv#8758
c750c8f 
ref tikv#8756

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Nov 6, 2024

@okJiang: new pull request created to branch release-8.1: #8779.

Details

In response to this:

/cherry-pick release-8.1
/cherry-pick release-6.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot mentioned this pull request Nov 6, 2024
Merged
ti-chi-bot Bot pushed a commit that referenced this pull request Nov 7, 2024
@ti-chi-bot @okJiang
scheduler: use right check for evict/grant leader scheduler (#8758) (#…
f235847 
…8779)

ref #8756

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: okJiang <819421878@qq.com>

Co-authored-by: okJiang <819421878@qq.com>
ti-chi-bot Bot pushed a commit that referenced this pull request Nov 7, 2024
@ti-chi-bot @okJiang
scheduler: use right check for evict/grant leader scheduler (#8758) (#…
7fe011a 
…8778)

ref #8756

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: okJiang <819421878@qq.com>

Co-authored-by: okJiang <819421878@qq.com>
rleungx pushed a commit to ti-chi-bot/pd that referenced this pull request Feb 19, 2025
@okJiang @ti-chi-bot @rleungx
scheduler: use right check for evict/grant leader scheduler (tikv#8758)
a20c4a9 
ref tikv#8756

Signed-off-by: okJiang <819421878@qq.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
@rleungx rleungx mentioned this pull request Feb 19, 2025
Merged
ti-chi-bot Bot pushed a commit that referenced this pull request Feb 19, 2025
@ti-chi-bot @okJiang @rleungx
*: reset config if the input is invalid (#8632) (#8662)
4f84cbc 
close #8619, ref #8758

Signed-off-by: okJiang <819421878@qq.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: okJiang <819421878@qq.com>
Co-authored-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot Bot added release-note-none Denotes a PR that doesn't merit a release note. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. release-note-none Denotes a PR that doesn't merit a release note. labels Mar 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@rleungx rleungx rleungx approved these changes

Assignees

No one assigned

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@okJiang @ti-chi-bot @lhy1024 @rleungx