Skip to content

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

Merged
ti-chi-bot[bot] merged 2 commits intotikv:release-7.1from
ti-chi-bot:cherry-pick-8758-to-release-7.1
Nov 5, 2024
Merged

scheduler: use right check for evict/grant leader scheduler (#8758)#8773
ti-chi-bot[bot] merged 2 commits intotikv:release-7.1from
ti-chi-bot:cherry-pick-8758-to-release-7.1

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #8758

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

Signed-off-by: okJiang <819421878@qq.com>
Signed-off-by: okJiang <819421878@qq.com>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. 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. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Nov 5, 2024
@ti-chi-bot ti-chi-bot Bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 5, 2024
@ti-chi-bot ti-chi-bot Bot added the lgtm label 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: okJiang, 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 approved 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:43:12.294979241 +0000 UTC m=+944105.134134772: ☑️ agreed by okJiang.
  • 2024-11-05 08:44:54.894630884 +0000 UTC m=+944207.733786429: ☑️ agreed by rleungx.

@ti-chi-bot ti-chi-bot Bot merged commit a385ada into tikv:release-7.1 Nov 5, 2024
@okJiang okJiang deleted the cherry-pick-8758-to-release-7.1 branch November 5, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants