use startTs for failed changefeed that has failed before being initia…

…lized
pingcap · May 6, 2023 · edfaae5 · edfaae5
1 parent 455681d
commit edfaae5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cdc/owner/feed_state_manager.go b/cdc/owner/feed_state_manager.go
@@ -136,6 +136,7 @@ func (m *feedStateManager) Tick(state *orchestrator.ChangefeedReactorState) (adm
 	case model.StateError:
 		if m.state.Info.Error.IsChangefeedUnRetryableError() {
 			m.shouldBeRunning = false
+			m.patchState(model.StateFailed)
 			return
 		}
 	}

diff --git a/cdc/owner/owner.go b/cdc/owner/owner.go
@@ -711,7 +711,13 @@ func (o *ownerImpl) ignoreFailedChangeFeedWhenGC(
 		log.Warn("upstream not found", zap.Uint64("ID", upID))
 		return false
 	}
-	return us.GCManager.IgnoreFailedChangeFeed(state.Status.CheckpointTs)
+	// in case the changefeed failed right after it is created
+	// and the status is not initialized yet.
+	ts := state.Info.StartTs
+	if state.Status != nil {
+		ts = state.Status.CheckpointTs
+	}
+	return us.GCManager.IgnoreFailedChangeFeed(ts)
 }
 
 // calculateGCSafepoint calculates GCSafepoint for different upstream.