ddl/ingest: fix checkpoint resume when owner changes several times (#…

…44760) (#44859) close #44619
pingcap · Jul 10, 2023 · b774a1f · b774a1f
1 parent ea0ed97
commit b774a1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ddl/index.go b/ddl/index.go
@@ -1849,6 +1849,7 @@ func (w *worker) addTableIndex(t table.Table, reorgInfo *reorgInfo) error {
 			if err != nil {
 				break
 			}
+
 			finish, err = updateReorgInfo(w.sessPool, tbl, reorgInfo)
 			if err != nil {
 				return errors.Trace(err)

diff --git a/ddl/ingest/checkpoint.go b/ddl/ingest/checkpoint.go
@@ -299,13 +299,13 @@ func (s *CheckpointManager) resumeCheckpoint() error {
 		if cp := reorgMeta.Checkpoint; cp != nil {
 			s.minKeySyncGlobal = cp.GlobalSyncKey
 			s.globalCnt = cp.GlobalKeyCount
+			s.pidGlobal = cp.PhysicalID
+			s.startGlobal = cp.StartKey
+			s.endGlobal = cp.EndKey
 			if s.instanceAddr == cp.InstanceAddr || cp.InstanceAddr == "" /* initial state */ {
 				s.localDataIsValid = true
 				s.minKeySyncLocal = cp.LocalSyncKey
 				s.localCnt = cp.LocalKeyCount
-				s.pidGlobal = cp.PhysicalID
-				s.startGlobal = cp.StartKey
-				s.endGlobal = cp.EndKey
 			}
 			logutil.BgLogger().Info("[ddl-ingest] resume checkpoint",
 				zap.Int64("job ID", s.jobID), zap.Int64("index ID", s.indexID),