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.

Sign up for GitHub

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

Jump to bottom

region_scatter: fix a bug that PD may panic when scatter region if region is unhealthy #6128

Merged
merged 3 commits into from Mar 9, 2023
Merged

region_scatter: fix a bug that PD may panic when scatter region if region is unhealthy #6128

merged 3 commits into from Mar 9, 2023

Conversation

HunDunDM
Copy link
Member

@HunDunDM HunDunDM commented Mar 9, 2023

What problem does this PR solve?

Issue Number: Close #6099

What is changed and how does it work?

region_scatter: fix a bug that PD may panic when scatter region if region is unhealthy

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix a bug that PD may panic when scatter region if region is unhealthy

@HunDunDM
add unittest
986e4b5 
Signed-off-by: HunDunDM <hundundm@gmail.com>
@HunDunDM
region_scatter: fix a bug that PD may panic when scatter region if re…
47b92f5 
…gion is unhealthy

Signed-off-by: HunDunDM <hundundm@gmail.com>
@HunDunDM
tiny fix
38f5425 
Signed-off-by: HunDunDM <hundundm@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 9, 2023 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • rleungx

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 added needs-cherry-pick-release-6.5 release-note The PR should write the release note. labels Mar 9, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 9, 2023
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 9, 2023
@CabinfeverB CabinfeverB mentioned this pull request Mar 9, 2023
Merged
@nolouch
Copy link
Contributor

nolouch commented Mar 9, 2023

/merge

@ti-chi-bot
Copy link
Member

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

/run-all-tests

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
Copy link
Member

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

Commit hash: 38f5425

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 9, 2023
bufferflies
bufferflies reviewed Mar 9, 2023
View reviewed changes
server/schedule/region_scatterer.go
rule := fit.GetRuleFit(peer.GetId()).Rule
if rule.IsWitness {
peerFit := fit.GetRuleFit(peer.GetId())
if peerFit == nil || peerFit.Rule == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

why not add one condition peerFit.Rule.IsWitness?

@ti-chi-bot ti-chi-bot merged commit fda6fef into tikv:master Mar 9, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 9, 2023
Merged
@ti-chi-bot
Copy link
Member

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

@nolouch nolouch deleted the fix-6099 branch March 9, 2023 10:14
ti-chi-bot added a commit that referenced this pull request Mar 9, 2023
@ti-chi-bot @HunDunDM
region_scatter: fix a bug that PD may panic when scatter region if re…
bd80719 
…gion is unhealthy (#6128) (#6129)

close #6099, ref #6128

Signed-off-by: HunDunDM <hundundm@gmail.com>

Co-authored-by: HunDunDM <hundundm@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bufferflies bufferflies bufferflies left review comments

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@rleungx rleungx rleungx approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.5 release-note The PR should write the release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

v6.5.1 lightning import data to master fail for pd reset the connection
6 participants
@HunDunDM @ti-chi-bot @nolouch @bufferflies @CabinfeverB @rleungx