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.

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

br: Remove statement from closure to prevent concurrent operation during backup system table (#29730) #29774

Merged
merged 1 commit into from
Nov 15, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 15, 2021

cherry-pick #29730 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/29774

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

git push git@github.com:ti-srebot/tidb.git pr/29774:release-5.3-bc10104e05b0

Signed-off-by: joccau zak.zhao@pingcap.com

What problem does this PR solve?

Issue Number: close #29710

Problem Summary:
Append the prefix __TiDB_BR_Temporary_ into system database mysql multiply.
It causes restore failed because of incorrect schema name

What is changed and how it works?

Check List

Tests

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

Backup system table before fix
[2021/11/12 14:30:15.438 +08:00] [INFO] [validate.go:78] ["checksum success"] [db=__TiDB_BR_Temporary___TiDB_BR_Temporary___TiDB_BR_Temporary_mysql] [table=person]

Backup and restore system table after fix
[2021/11/12 15:54:00.890 +08:00] [INFO] [validate.go:78] ["checksum success"] [db=__TiDB_BR_Temporary_mysql] [table=person]

[2021/11/12 16:12:22.328 +08:00] [INFO] [ddl.go:553] ["[ddl] start DDL job"] [job="ID:168, Type:rename table, State:none, SchemaState:queueing, SchemaID:3, TableID:123, RowCount:0, ArgLen:3, start time: 2021-11-12 16:12:22.229 +0800 CST, Err:<nil>, ErrCount:0, SnapshotVersion:0"] [query="RENAME TABLE__tidb_br_temporary_mysql.personTOmysql.person;"]

Release note

None

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 15, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

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/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. labels Nov 15, 2021
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Nov 15, 2021
@ti-srebot
Copy link
Contributor Author

@joccau please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

@ti-chi-bot ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Nov 15, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 15, 2021
@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 Nov 15, 2021
@joccau
Copy link
Member

joccau commented Nov 15, 2021

/run-check_dev

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 15, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2da3d31

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 15, 2021
@joccau
Copy link
Member

joccau commented Nov 15, 2021

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit 7bc669c into pingcap:release-5.3 Nov 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/br This issue is related to BR of TiDB. release-note-none Denotes a PR that doesn't merit a release note. 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
Development

Successfully merging this pull request may close these issues.

6 participants