This is an automated cherry-pick of pingcap#9953

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Oct 26, 2023 · dc008bb · dc008bb
1 parent 6ba0aec
commit dc008bb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go
@@ -447,12 +447,20 @@ LOOP2:
 		}
 	}
 
+<<<<<<< HEAD
 	checkpointTs := c.state.Status.CheckpointTs
 	if c.resolvedTs == 0 {
 		c.resolvedTs = checkpointTs
 	}
 
 	minTableBarrierTs := c.state.Status.MinTableBarrierTs
+=======
+	checkpointTs := c.latestStatus.CheckpointTs
+	if c.resolvedTs == 0 {
+		c.resolvedTs = checkpointTs
+	}
+	minTableBarrierTs := c.latestStatus.MinTableBarrierTs
+>>>>>>> 0c29040814 (scheduler(ticdc): revert 3b8d55 and do not return error when resolvedTs less than checkpoint (#9953))
 
 	failpoint.Inject("NewChangefeedNoRetryError", func() {
 		failpoint.Return(cerror.ErrStartTsBeforeGC.GenWithStackByArgs(checkpointTs-300, checkpointTs))