From dc008bbaff70975d38ae32f9ecc1ae46e2d233cc Mon Sep 17 00:00:00 2001 From: CharlesCheung <61726649+CharlesCheung96@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:06:34 +0800 Subject: [PATCH] This is an automated cherry-pick of #9953 Signed-off-by: ti-chi-bot --- cdc/owner/changefeed.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go index 9b6e0413738..cece1b8ab03 100644 --- 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))