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

ddl: fix unexpected delete ETCD value (#52504) #53738

Merged
merged 3 commits into from
Jun 5, 2024
Merged

ddl: fix unexpected delete ETCD value (#52504) #53738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0b70f6
This is an automated cherry-pick of #52504
wjhuang2016 Apr 16, 2024
71ac99b
fix conflict
lance6716 Jun 5, 2024
f5c5524
delete wrong file
lance6716 Jun 5, 2024
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
4 changes: 2 additions & 2 deletions ddl/ddl_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ func (w *worker) registerMDLInfo(job *model.Job, ver int64) error {
}

// cleanMDLInfo cleans metadata lock info.
func cleanMDLInfo(pool *sessionPool, jobID int64, ec *clientv3.Client) {
func cleanMDLInfo(pool *sessionPool, jobID int64, ec *clientv3.Client, cleanETCD bool) {
if !variable.EnableMDL.Load() {
return
}
Expand All @@ -539,7 +539,7 @@ func cleanMDLInfo(pool *sessionPool, jobID int64, ec *clientv3.Client) {
logutil.BgLogger().Warn("unexpected error when clean mdl info", zap.Int64("job ID", jobID), zap.Error(err))
return
}
if ec != nil {
if cleanETCD && ec != nil {
path := fmt.Sprintf("%s/%d/", util.DDLAllSchemaVersionsByJob, jobID)
_, err = ec.Delete(context.Background(), path, clientv3.WithPrefix())
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions ddl/job_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func (d *ddl) delivery2worker(wk *worker, pool *workerPool, job *model.Job) {
return
}
d.setAlreadyRunOnce(job.ID)
cleanMDLInfo(d.sessPool, job.ID, d.etcdCli)
cleanMDLInfo(d.sessPool, job.ID, d.etcdCli, job.State == model.JobStateSynced)
// Don't have a worker now.
return
}
Expand Down Expand Up @@ -272,7 +272,7 @@ func (d *ddl) delivery2worker(wk *worker, pool *workerPool, job *model.Job) {
logutil.BgLogger().Info("wait latest schema version error", zap.String("category", "ddl"), zap.Error(err))
return
}
cleanMDLInfo(d.sessPool, job.ID, d.etcdCli)
cleanMDLInfo(d.sessPool, job.ID, d.etcdCli, job.State == model.JobStateSynced)
d.synced(job)

if RunInGoTest {
Expand Down
Loading