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: Compatibility problem between br and TiDB for DDLs about attribute in Incremental Backup #29360

Merged
merged 9 commits into from
Nov 4, 2021
Merged

br: Compatibility problem between br and TiDB for DDLs about attribute in Incremental Backup #29360

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d161d8b
Merge remote-tracking branch 'origin/master' into fix-skipDDL-attribute
joccau Nov 2, 2021
eed8c30
Incremental Backup need skip DDLs about attribute for compatiblility
joccau Nov 2, 2021
f79f2e1
fix typo
joccau Nov 2, 2021
4b0f1b7
Merge branch 'master' into fix-skipDDL-attribute
joccau Nov 2, 2021
7c20328
Merge branch 'master' into fix-skipDDL-attribute
joccau Nov 4, 2021
d0577fb
Merge branch 'master' into fix-skipDDL-attribute
joccau Nov 4, 2021
17a2271
Merge branch 'master' into fix-skipDDL-attribute
joccau Nov 4, 2021
7efad08
Add testcase: skip DDl about region placement when backup
joccau Nov 4, 2021
91cbade
Merge branch 'master' into fix-skipDDL-attribute
joccau Nov 4, 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
15 changes: 15 additions & 0 deletions br/pkg/backup/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,17 @@ func BuildBackupRangeAndSchema(
return ranges, backupSchemas, nil
}

func skipUnsupportedDDLJob(job *model.Job) bool {
switch job.Type {
// Because TiDB V5.3.0 supports TableAttributes and TablePartitionAttributes.
// Incremental Backup need skip these DDLs to be compatible with previous br versions.
case model.ActionAlterTableAttributes, model.ActionAlterTablePartitionAttributes:
return true
}

return false
}

// WriteBackupDDLJobs sends the ddl jobs are done in (lastBackupTS, backupTS] to metaWriter.
func WriteBackupDDLJobs(metaWriter *metautil.MetaWriter, store kv.Storage, lastBackupTS, backupTS uint64) error {
snapshot := store.GetSnapshot(kv.NewVersion(backupTS))
Expand Down Expand Up @@ -388,6 +399,10 @@ func WriteBackupDDLJobs(metaWriter *metautil.MetaWriter, store kv.Storage, lastB

count := 0
for _, job := range allJobs {
if skipUnsupportedDDLJob(job) {
continue
}

if (job.State == model.JobStateDone || job.State == model.JobStateSynced) &&
(job.BinlogInfo != nil && job.BinlogInfo.SchemaVersion > lastSchemaVersion) {
jobBytes, err := json.Marshal(job)
Expand Down