Update region_worker.go

pingcap · Jun 15, 2022 · a764766 · a764766
1 parent 3ba2693
commit a764766
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/cdc/kv/region_worker.go b/cdc/kv/region_worker.go
@@ -749,14 +749,8 @@ func (w *regionWorker) handleResolvedTs(
 	}
 
 	if resolvedTs < state.lastResolvedTs {
-<<<<<<< HEAD
-		log.Warn("The resolvedTs is fallen back in kvclient",
-			zap.String("changefeed", w.session.client.changefeed),
-=======
 		log.Debug("The resolvedTs is fallen back in kvclient",
-			zap.String("namesapce", w.session.client.changefeed.Namespace),
-			zap.String("changefeed", w.session.client.changefeed.ID),
->>>>>>> 377f8022f (kv(ticdc): set debug level for resolved ts fallback log (#5558))
+			zap.String("changefeed", w.session.client.changefeed),
 			zap.String("EventType", "RESOLVED"),
 			zap.Uint64("resolvedTs", resolvedTs),
 			zap.Uint64("lastResolvedTs", state.lastResolvedTs),