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

br: fix the missing retry for pd batch scan error (#33420) #33471

Merged
merged 2 commits into from
Mar 28, 2022
Merged

br: fix the missing retry for pd batch scan error (#33420) #33471

merged 2 commits into from
Mar 28, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 25, 2022 •
edited
Loading

cherry-pick #33420 to release-6.0
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/33471

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

git push [email protected]:ti-srebot/tidb.git pr/33471:release-6.0-9129590f5b0c

What problem does this PR solve?

Issue Number: close #33419

Problem Summary:
current BR doesn't not retry ErrPDBatchScanRegion enough.

What is changed and how it works?

replace the multierr with the ErrPDBatchScanRegion

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 the issue that BR not retry enough when region not consistency during restoration.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • glorv

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added 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 Mar 25, 2022
@ti-srebot ti-srebot added cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.0-cherry-pick labels Mar 25, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 25, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Mar 25, 2022
@ti-srebot
Copy link
Contributor Author

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

@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 28, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 28, 2022
@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 28, 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: fad6fa0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2022
@3pointer
Copy link
Contributor

/run-mysql-test

@3pointer
Copy link
Contributor

/run-mysql-test
/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Mar 28, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/fad6fa05c23c48ceead59f78e0d1ff80ed60da9d

@ti-chi-bot ti-chi-bot merged commit 4bd69a7 into pingcap:release-6.0 Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@glorv glorv glorv approved these changes

@sleepymole sleepymole Awaiting requested review from sleepymole

@joccau joccau Awaiting requested review from joccau

@zhouqiang-cl zhouqiang-cl Awaiting requested review from zhouqiang-cl

Assignees

@3pointer 3pointer

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. size/S Denotes a PR that changes 10-29 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/6.0-cherry-pick
Projects
None yet
Milestone
No milestone
Development

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