This is an automated cherry-pick of pingcap#4500

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Feb 7, 2022 · 745b501 · 745b501
1 parent ac9cb09
commit 745b501
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/dm/syncer/syncer.go b/dm/syncer/syncer.go
@@ -1194,8 +1194,13 @@ func (s *Syncer) afterFlushCheckpoint(task *checkpointFlushTask) error {
 		s.tctx.L().Info("after async flushed checkpoint, gc stale causality keys", zap.Int64("flush job seq", task.asyncflushJob.flushSeq))
 		s.dmlJobCh <- newGCJob(task.asyncflushJob.flushSeq)
 	} else {
+<<<<<<< HEAD
 		s.tctx.L().Info("after async flushed checkpoint, gc all causality keys")
 		s.dmlJobCh <- newGCJob(math.MaxInt64)
+=======
+		s.tctx.L().Info("after sync flushed checkpoint, gc all causality keys")
+		s.addJob(newGCJob(math.MaxInt64))
+>>>>>>> b0f52af9c (syncer(dm): Fix async flush log message (#4500))
 	}
 
 	// update current active relay log after checkpoint flushed