ddl: remove reorg ctx when current instance is not owner (#55050)

close #54897
pingcap · Jul 30, 2024 · 6990c1f · 6990c1f
1 parent d2304c8
commit 6990c1f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/ddl/backfilling.go b/pkg/ddl/backfilling.go
@@ -674,8 +674,12 @@ func (dc *ddlCtx) writePhysicalTableRecord(sessPool *sess.Pool, t table.Physical
 	totalAddedCount := job.GetRowCount()
 
 	startKey, endKey := reorgInfo.StartKey, reorgInfo.EndKey
-
 	if err := dc.isReorgRunnable(reorgInfo.Job.ID, false); err != nil {
+		if errors.ErrorEqual(err, dbterror.ErrNotOwner) {
+			// This instance is not DDL owner, we remove reorgctx proactively
+			// to avoid being used later.
+			dc.removeReorgCtx(reorgInfo.ID)
+		}
 		return errors.Trace(err)
 	}