Skip to content

br: skip template system table __TiDB_BR_Temporary_mysql when backup (#41000)#41250

Merged
ti-chi-bot merged 2 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-41000-to-release-6.5
Feb 13, 2023
Merged

br: skip template system table __TiDB_BR_Temporary_mysql when backup (#41000)#41250
ti-chi-bot merged 2 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-41000-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Feb 9, 2023

This is an automated cherry-pick of #41000

What problem does this PR solve?

Issue Number: close #40797

Problem Summary:
The process of br restore panic because of the duplicate template system table in __TiDB_BR_Temporary_mysql.

What is changed and how it works?

Skip template system table __TiDB_BR_Temporary_mysql when backup.

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.

Skip template system table __TiDB_BR_Temporary_mysql when backup.

joccau added 2 commits February 9, 2023 15:55
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 9, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Leavrth
  • 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.

Details

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 9, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 9, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Feb 9, 2023
@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 10, 2023

/hold high priority for trunk branch

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 10, 2023

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 13, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 13, 2023
joccau
joccau approved these changes Feb 13, 2023
View reviewed changes
Copy link
Contributor

@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 13, 2023
@joccau
Copy link
Contributor

joccau commented Feb 13, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 13, 2023

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

DetailsCommit hash: 31cb972

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

joccau commented Feb 13, 2023

/rebuild

@joccau
Copy link
Contributor

joccau commented Feb 13, 2023

rebuild

@wuhuizuo
Copy link
Contributor

wuhuizuo commented Feb 13, 2023

/retest

@ti-chi-bot ti-chi-bot merged commit 2a0cd1b into pingcap:release-6.5 Feb 13, 2023
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 13, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-41000-to-release-6.5 branch April 15, 2025 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Leavrth Leavrth Leavrth approved these changes

+1 more reviewer

@joccau joccau joccau approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@joccau joccau

Labels

cherry-pick-approved Cherry pick PR approved by release team. 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/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @wuhuizuo @joccau @Leavrth @VelocityLight