From 744de86c61e2007c851cf3d4fec89787b943646a Mon Sep 17 00:00:00 2001 From: tangenta Date: Sun, 29 Jan 2023 18:41:54 +0800 Subject: [PATCH] ddl: move update version function to a proper place (#40817) ref pingcap/tidb#40217 --- ddl/index.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ddl/index.go b/ddl/index.go index 221005f58c211..cc3a3d3795242 100644 --- a/ddl/index.go +++ b/ddl/index.go @@ -791,6 +791,9 @@ func doReorgWorkForCreateIndexMultiSchema(w *worker, d *ddlCtx, t *meta.Meta, jo done, ver, err = doReorgWorkForCreateIndex(w, d, t, job, tbl, indexInfo) if done { job.MarkNonRevertible() + if err == nil { + ver, err = updateVersionAndTableInfo(d, t, job, tbl.Meta(), true) + } } // We need another round to wait for all the others sub-jobs to finish. return false, ver, err @@ -877,7 +880,6 @@ func doReorgWorkForCreateIndex(w *worker, d *ddlCtx, t *meta.Meta, job *model.Jo return false, ver, err } indexInfo.BackfillState = model.BackfillStateInapplicable // Prevent double-write on this index. - ver, err = updateVersionAndTableInfo(d, t, job, tbl.Meta(), true) return true, ver, err default: return false, 0, dbterror.ErrInvalidDDLState.GenWithStackByArgs("backfill", indexInfo.BackfillState)