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: add error into retry list when backup (#34930) #34983

Merged
merged 3 commits into from
May 31, 2022
Merged

br: add error into retry list when backup (#34930) #34983

merged 3 commits into from
May 31, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 26, 2022 •
edited
Loading

cherry-pick #34930 to release-5.4
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/34983

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

git push git@github.com:ti-srebot/tidb.git pr/34983:release-5.4-0f85650aa43c

What problem does this PR solve?

Issue Number: close #34865

Problem Summary:

What is changed and how it works?

br need to retry backup region when br received the specific error from TiKV when TiKV write sst-file to storage.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@joccau @ti-srebot
cherry pick pingcap#34930 to release-5.4
08a3893 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 26, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • fengou1

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 May 26, 2022
@ti-srebot ti-srebot mentioned this pull request May 26, 2022
Merged
12 tasks
@ti-srebot ti-srebot added affects-5.4 This bug affects the 5.4.x(LTS) versions. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.4-cherry-pick labels May 26, 2022
@ti-srebot ti-srebot added this to the v5.4.1 milestone May 26, 2022
@ti-srebot
Copy link
Contributor Author

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

@joccau
resolve conflicts
b33fd45 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Member

joccau commented May 26, 2022

/run-integration-br-test

@sre-bot
Copy link
Contributor

sre-bot commented May 26, 2022 •
edited
Loading

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

@joccau
Copy link
Member

joccau commented May 27, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 27, 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 May 27, 2022
@joccau
Copy link
Member

joccau commented May 30, 2022

/run-all-tests

@joccau
Copy link
Member

joccau commented May 30, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b33fd45

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label May 30, 2022
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/cherry-pick-not-approved labels May 30, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 31, 2022
@joccau
Copy link
Member

joccau commented May 31, 2022

/run-integration-br-test

@joccau
Copy link
Member

joccau commented May 31, 2022

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit 4d888ce into pingcap:release-5.4 May 31, 2022
@heibaijian heibaijian modified the milestones: v5.4.1, v5.4.2 Jun 27, 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

@fengou1 fengou1 fengou1 approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

@WangLe1321 WangLe1321 Awaiting requested review from WangLe1321

Assignees

@joccau joccau

Labels
affects-5.4 This bug affects the 5.4.x(LTS) versions. cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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/5.4-cherry-pick
Projects
None yet
Milestone
v5.4.2
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @joccau @sre-bot @YuJuncen @fengou1 @heibaijian