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

Merged
merged 9 commits into from
Nov 15, 2021
Merged

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

merged 9 commits into from
Nov 15, 2021

Conversation

joccau
Copy link
Member

@joccau joccau commented Nov 12, 2021 •
edited
Loading

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
Remove add-Temporary-prefix from closure to prevent concurrent operat…
f8b4aff 
…ions.

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

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

[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-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 12, 2021
@joccau
Copy link
Member Author

joccau commented Nov 12, 2021

/cc @kennytm @3pointer @fengou1 @YuJuncen

YuJuncen
YuJuncen approved these changes Nov 12, 2021
View reviewed changes
Copy link
Contributor

@YuJuncen YuJuncen left a comment

Choose a reason for hiding this comment

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

LGTM, maybe also add a test (with race enabled, this would be easy to be caught)?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 12, 2021
@joccau
Copy link
Member Author

joccau commented Nov 12, 2021

/component br

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Nov 12, 2021
@joccau
Copy link
Member Author

joccau commented Nov 12, 2021

/sig migrate

@joccau
Copy link
Member Author

joccau commented Nov 12, 2021

Need to cherry-pick 5.2.* in tidb Repo and 5.1.* in br repo

@joccau
Copy link
Member Author

joccau commented Nov 12, 2021

/run-check_dev_2

@3pointer 3pointer added the needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 label Nov 15, 2021
@joccau
Add test case for backup system schema
1fb5617 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels 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
@ti-chi-bot
Copy link
Member

@joccau: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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 ti-community-infra/tichi repository.

@YuJuncen
Copy link
Contributor

/run-integration-br-tests

@joccau
Copy link
Member Author

joccau commented Nov 15, 2021

/run-integration-br-test

1 similar comment
@joccau
Copy link
Member Author

joccau commented Nov 15, 2021

/run-integration-br-test

@3pointer
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3ca590a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 15, 2021
@ti-chi-bot ti-chi-bot merged commit bc10104 into pingcap:master Nov 15, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Nov 15, 2021
@joccau @ti-srebot
cherry pick pingcap#29730 to release-5.3
2da3d31 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Nov 15, 2021
Merged
4 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #29774

ti-chi-bot pushed a commit that referenced this pull request Nov 15, 2021
@ti-srebot
br: Remove statement from closure to prevent concurrent operation dur…
7bc669c 
…ing backup system table (#29730) (#29774)
@joccau joccau deleted the fix-backup-sysTable branch November 16, 2021 09:45
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Nov 22, 2021
@joccau @ti-srebot
cherry pick pingcap#29730 to release-5.2
271de8a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Nov 22, 2021
Closed
4 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #29976

This was referenced Nov 24, 2021
Closed
Closed
Merged
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 8, 2021
Closed
@3pointer 3pointer mentioned this pull request Jan 14, 2022
Merged
14 tasks
glorv added a commit to glorv/br that referenced this pull request Jan 24, 2022
@glorv
cherry-pick pingcap/tidb#29730 to pass integration test
9a534dc
@glorv glorv mentioned this pull request Jan 24, 2022
Merged
glorv added a commit to pingcap/br that referenced this pull request Jan 25, 2022
@glorv
lightning: cherry-pick some PRs (#1458)
ec59c7b 
* cp tidb#27769

* cp tidb#30393

* cherry-pick pingcap/tidb#29730 to pass integration test

* skip integration test br_log_restore

* fix some integration tests
This was referenced Jan 25, 2022
Closed
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

@fengou1 fengou1 Awaiting requested review from fengou1

@kennytm kennytm Awaiting requested review from kennytm

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

System table restore failed
5 participants
@joccau @ti-chi-bot @YuJuncen @3pointer @ti-srebot