database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: check owner status before commit DDL changes (#50251)

Browse Source 
close pingcap/tidb#47105, close pingcap/tidb#50055
This commit is contained in:
tangenta
2024-01-11 11:32:01 +08:00
committed by GitHub
parent e3bd0df35d
commit b4ce5d00fb
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/ddl/ddl_worker.go
View File

@ -849,6 +849,9 @@ func (w *JobContext) setDDLLabelForDiagnosis(jobType model.ActionType) {
}
func (w *worker) HandleJobDone(d *ddlCtx, job *model.Job, t *meta.Meta) error {
if err := w.checkOwnerBeforeCommit(); err != nil {
return err
}
err := w.finishDDLJob(t, job)
if err != nil {
w.sess.Rollback()
@ -942,6 +945,10 @@ func (w *worker) HandleDDLJobTable(d *ddlCtx, job *model.Job) (int64, error) {
return 0, err
}
if err = w.checkOwnerBeforeCommit(); err != nil {
return 0, err
}
if runJobErr != nil && !job.IsRollingback() && !job.IsRollbackDone() {
// If the running job meets an error
// and the job state is rolling back, it means that we have already handled this error.
@ -989,6 +996,16 @@ func (w *worker) HandleDDLJobTable(d *ddlCtx, job *model.Job) (int64, error) {
return schemaVer, nil
}
func (w *worker) checkOwnerBeforeCommit() error {
if !w.ddlCtx.isOwner() && w.tp != localWorker {
// Since this TiDB instance is not a DDL owner anymore,
// it should not commit any transaction.
w.sess.Rollback()
return dbterror.ErrNotOwner
}
return nil
}
// HandleDDLJobV2 handles v2 ddl job.
// Compare with v1:
// 1. directly insert the job to history job table(incompatible with CDC).