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

Merged
merged 3 commits into from
Nov 23, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Nov 22, 2023

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.

Copy link
Contributor

ti-chi-bot bot commented Nov 22, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bufferflies
  • 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 release-note-none Denotes a PR that doesn't merit a release note. label Nov 22, 2023
@ti-chi-bot ti-chi-bot bot requested review from lhy1024 and nolouch November 22, 2023 08:51
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 22, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 22, 2023
@@ -132,6 +132,11 @@ func (c *RuleChecker) CheckWithFit(region *core.RegionInfo, fit *placement.Regio
return
}

// the placement rule is disabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to pick it to other branches?

Copy link

codecov bot commented Nov 22, 2023

Codecov Report

Merging #7415 (f0c97e9) into master (8198735) will increase coverage by 0.08%.
Report is 1 commits behind head on master.
The diff coverage is 0.00%.

❗ Current head f0c97e9 differs from pull request most recent head 09394e2. Consider uploading reports for the commit 09394e2 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7415      +/-   ##
==========================================
+ Coverage   74.21%   74.29%   +0.08%     
==========================================
  Files         451      451              
  Lines       49385    49388       +3     
==========================================
+ Hits        36652    36694      +42     
+ Misses       9461     9432      -29     
+ Partials     3272     3262      -10     
Flag Coverage Δ
unittests 74.29% <0.00%> (+0.08%) ⬆️

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

@@ -132,6 +132,11 @@ func (c *RuleChecker) CheckWithFit(region *core.RegionInfo, fit *placement.Regio
return
}

// the placement rule is disabled
if fit == nil {
return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add one metrics for it or add log?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think no need since it happens only once.

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. do-not-merge/needs-triage-completed needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed status/LGT1 Indicates that a PR has LGTM 1. do-not-merge/needs-triage-completed labels Nov 23, 2023
@rleungx
Copy link
Member Author

rleungx commented Nov 23, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 23, 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 Nov 23, 2023

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

Commit hash: f0c97e9

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

ti-chi-bot bot commented Nov 23, 2023

@rleungx: 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 0222af0 into tikv:master Nov 23, 2023
19 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #7422.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Nov 23, 2023
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #7423.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #7424.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #7425.

@rleungx rleungx deleted the fix-panic3 branch November 23, 2023 09:41
ti-chi-bot bot pushed a commit that referenced this pull request Nov 27, 2023
close #7414

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: Hu# <[email protected]>
rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023
close tikv#7414

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot added a commit that referenced this pull request Dec 6, 2023
close #7414

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot added a commit that referenced this pull request Feb 7, 2024
close #7414

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot added a commit that referenced this pull request Sep 10, 2024
close #7414

Signed-off-by: ti-chi-bot <[email protected]>
Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

panic in tests/pdctl/operator
4 participants