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

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

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8b4aff
Remove add-Temporary-prefix from closure to prevent concurrent operat…
joccau Nov 12, 2021
1fb5617
Add test case for backup system schema
joccau Nov 15, 2021
5fd59cb
Merge branch 'master' into fix-backup-sysTable
joccau Nov 15, 2021
3ca590a
Merge branch 'master' into fix-backup-sysTable
joccau Nov 15, 2021
df6ee34
Merge branch 'master' into fix-backup-sysTable
ti-chi-bot Nov 15, 2021
35c3338
Merge branch 'master' into fix-backup-sysTable
joccau Nov 15, 2021
56797b2
Merge branch 'master' into fix-backup-sysTable
3pointer Nov 15, 2021
69d62e8
Merge branch 'master' into fix-backup-sysTable
ti-chi-bot Nov 15, 2021
1803ea8
Merge branch 'master' into fix-backup-sysTable
ti-chi-bot Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions br/pkg/backup/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@ func (ss *Schemas) BackupSchemas(
metaWriter.StartWriteMetasAsync(ctx, op)
for _, s := range ss.schemas {
schema := s
// Because schema.dbInfo is a pointer that many tables point to.
// Remove "add Temporary-prefix into dbName" from closure to prevent concurrent operations.
if utils.IsSysDB(schema.dbInfo.Name.L) {
schema.dbInfo.Name = utils.TemporaryDBName(schema.dbInfo.Name.O)
}

workerPool.ApplyOnErrorGroup(errg, func() error {
if utils.IsSysDB(schema.dbInfo.Name.L) {
schema.dbInfo.Name = utils.TemporaryDBName(schema.dbInfo.Name.O)
}
logger := log.With(
zap.String("db", schema.dbInfo.Name.O),
zap.String("table", schema.tableInfo.Name.O),
Expand Down