ticdc:Fix too much unnecessary log for lastSyncedTs (#10667)

close #10289
pingcap · Feb 29, 2024 · 108d0e9 · 108d0e9
1 parent 92fc6d1
commit 108d0e9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go
@@ -425,12 +425,15 @@ func (c *changefeed) tick(ctx cdcContext.Context,
 	if err != nil {
 		return 0, 0, errors.Trace(err)
 	}
-	if c.lastSyncedTs < watermark.LastSyncedTs {
-		c.lastSyncedTs = watermark.LastSyncedTs
-	} else if c.lastSyncedTs > watermark.LastSyncedTs {
-		log.Warn("LastSyncedTs should not be greater than newLastSyncedTs",
-			zap.Uint64("c.LastSyncedTs", c.lastSyncedTs),
-			zap.Uint64("newLastSyncedTs", watermark.LastSyncedTs))
+
+	if watermark.LastSyncedTs != scheduler.CheckpointCannotProceed {
+		if c.lastSyncedTs < watermark.LastSyncedTs {
+			c.lastSyncedTs = watermark.LastSyncedTs
+		} else if c.lastSyncedTs > watermark.LastSyncedTs {
+			log.Warn("LastSyncedTs should not be greater than newLastSyncedTs",
+				zap.Uint64("c.LastSyncedTs", c.lastSyncedTs),
+				zap.Uint64("newLastSyncedTs", watermark.LastSyncedTs))
+		}
 	}
 
 	if watermark.PullerResolvedTs != scheduler.CheckpointCannotProceed && watermark.PullerResolvedTs != math.MaxUint64 {