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

scatter: check pending peers before scattering (#31691) #32128

Merged
merged 15 commits into from
Feb 23, 2022
Merged

scatter: check pending peers before scattering (#31691) #32128

merged 15 commits into from
Feb 23, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Feb 7, 2022 •
edited
Loading

cherry-pick #31691 to release-5.3
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/32128

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/32128:release-5.3-15748a4996b1

Signed-off-by: Yu Juncen yu745514916@live.com

What problem does this PR solve?

Issue Number: close #31034

Problem Summary:
When scattering regions, BR sometimes meets "pending" regions and fail to scatter them then. (This behavior is defined by PD, we can found them in the DEBUG log.)

This PR checks the pending status before doing scatter.

Why those pending regions exist is still in investigating, for more details, see tikv/pd#4525 and #31034.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix a bug that caused region unbalanced after restoring.

@YuJuncen @ti-srebot
cherry pick pingcap#31691 to release-5.3
4fe64d7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 7, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • joccau

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 7, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Feb 7, 2022
Merged
12 tasks
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. sig/migrate size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Feb 7, 2022
@ti-srebot
Copy link
Contributor Author

@YuJuncen you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 22, 2022
joccau
joccau approved these changes Feb 22, 2022
View reviewed changes
Copy link
Member

@joccau joccau left a comment

Choose a reason for hiding this comment

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

LGTM

@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 Feb 22, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 22, 2022
@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 62a9e2f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 22, 2022
@YuJuncen
Copy link
Contributor

/run-mysql-test

@3pointer
Copy link
Contributor

/merge

@YuJuncen
Copy link
Contributor

/run-mysql-test

@YuJuncen
Copy link
Contributor

/run-check_dev

@YuJuncen
Copy link
Contributor

/run-check_dev

@YuJuncen
Copy link
Contributor

/run-mysql-test

@YuJuncen
Copy link
Contributor

/merge

@YuJuncen
Copy link
Contributor

/run-check_dev

@YuJuncen
Copy link
Contributor

/run-check_dev

1 similar comment
@YuJuncen
Copy link
Contributor

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit c65493d into pingcap:release-5.3 Feb 23, 2022
@hawkingrei hawkingrei deleted the release-5.3-15748a4996b1 branch February 23, 2022 02:03
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@joccau joccau joccau approved these changes

@fengou1 fengou1 Awaiting requested review from fengou1

@hawkingrei hawkingrei Awaiting requested review from hawkingrei

Assignees

@YuJuncen YuJuncen

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/migrate size/M Denotes a PR that changes 30-99 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/5.3-cherry-pick
Projects
None yet
Milestone
v5.3.1
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @3pointer @YuJuncen @joccau @VelocityLight @purelind