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

schedule: fix panic when switching placement rules (#7415) #7424

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #7415

What problem does this PR solve?

Issue Number: Close #7414.

What is changed and how does it work?

When we going to disable the placement rule, we might first check:

if c.conf.IsPlacementRulesEnabled() {

Before we change it, the value is true. But when we call:

fit := c.priorityInspector.Inspect(region)

func (p *PriorityInspector) Inspect(region *core.RegionInfo) (fit *placement.RegionFit) {
var makeupCount int
if p.conf.IsPlacementRulesEnabled() {
makeupCount, fit = p.inspectRegionInPlacementRule(region)
} else {
makeupCount = p.inspectRegionInReplica(region)
}
priority := 0 - makeupCount
p.addOrRemoveRegion(priority, region.GetID())
return
}

The value can be changed to false. So the fit will be nil in this case.

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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 23, 2023
Copy link
Contributor

ti-chi-bot bot commented Nov 23, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • lhy1024

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 23, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 4, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 6, 2023
Copy link

codecov bot commented Dec 6, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (52966d8) 74.85% compared to head (710e0a9) 74.94%.

❗ Current head 710e0a9 differs from pull request most recent head 0885ce9. Consider uploading reports for the commit 0885ce9 to get more accurate results

Files Patch % Lines
pkg/schedule/checker/rule_checker.go 0.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.1    #7424      +/-   ##
===============================================
+ Coverage        74.85%   74.94%   +0.08%     
===============================================
  Files              409      409              
  Lines            41354    41334      -20     
===============================================
+ Hits             30955    30976      +21     
+ Misses            7683     7650      -33     
+ Partials          2716     2708       -8     
Flag Coverage Δ
unittests 74.94% <0.00%> (+0.08%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rleungx
Copy link
Member

rleungx commented Dec 6, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Dec 6, 2023

@rleungx: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

Copy link
Contributor

ti-chi-bot bot commented Dec 6, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 710e0a9

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 6, 2023
Copy link
Contributor

ti-chi-bot bot commented Dec 6, 2023

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 bot merged commit 894f634 into tikv:release-7.1 Dec 6, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. 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.

4 participants