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: Remove statement from closure to prevent concurrent operation during backup system table (#29730) #29976

Closed
wants to merge 4 commits into from
Closed

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

wants to merge 4 commits into from

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 22, 2021 •
edited
Loading

cherry-pick #29730 to release-5.2
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/29976

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

git push git@github.com:ti-srebot/tidb.git pr/29976:release-5.2-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

@joccau @ti-srebot
cherry pick pingcap#29730 to release-5.2
271de8a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 22, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fengou1
  • kennytm

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 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 Nov 22, 2021
@ti-srebot ti-srebot mentioned this pull request Nov 22, 2021
Merged
4 tasks
@ti-srebot ti-srebot added component/br This issue is related to BR of TiDB. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick labels Nov 22, 2021
@ti-srebot ti-srebot added this to the v5.2.2 milestone Nov 22, 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

@joccau
Copy link
Member

joccau commented Nov 22, 2021

/cherry-pick-invite

@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

@joccau
Copy link
Member

joccau commented Nov 25, 2021

/cherry-pick-invite

@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

@joccau
Copy link
Member

joccau commented Nov 25, 2021

/run-check_dev

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 29, 2021
@kennytm
Copy link
Contributor

kennytm commented Nov 29, 2021

/run-check_dev

1 similar comment
@joccau
Copy link
Member

joccau commented Dec 28, 2021

/run-check_dev

@joccau
Copy link
Member

joccau commented Dec 28, 2021

/cc @YuJuncen @Leavrth PTAL

@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @YuJuncen @Leavrth PTAL

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

fengou1
fengou1 approved these changes Jan 6, 2022
View reviewed changes
Copy link
Contributor

@fengou1 fengou1 left a comment

Choose a reason for hiding this comment

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

it look we fixed schema.dbInfo.Name be updated by the concurrent coroutines.

@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 Jan 6, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 15, 2022
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Apr 18, 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: c0dee5b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 18, 2022
@VelocityLight
Copy link

This pull request is closed because it's related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

You can find more details at:

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 21, 2022
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Nov 2, 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 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fengou1 fengou1 fengou1 approved these changes

@3pointer 3pointer 3pointer approved these changes

@kennytm kennytm kennytm approved these changes

@YuJuncen YuJuncen Awaiting requested review from YuJuncen

@Leavrth Leavrth Awaiting requested review from Leavrth

Assignees

@joccau joccau

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.2-cherry-pick
Projects
None yet
Milestone
v5.2.2
Development

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