From feea7f63bed45536b6b39953bfd84d052d898a68 Mon Sep 17 00:00:00 2001 From: qupeng Date: Mon, 16 Oct 2023 13:06:28 +0800 Subject: [PATCH] This is an automated cherry-pick of #9894 Signed-off-by: ti-chi-bot --- cdc/sinkv2/eventsink/mq/mq_dml_sink.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cdc/sinkv2/eventsink/mq/mq_dml_sink.go b/cdc/sinkv2/eventsink/mq/mq_dml_sink.go index 7481ebd9fe9..8d965b0a514 100644 --- a/cdc/sinkv2/eventsink/mq/mq_dml_sink.go +++ b/cdc/sinkv2/eventsink/mq/mq_dml_sink.go @@ -123,10 +123,14 @@ func newSink(ctx context.Context, if err != nil { if errors.Cause(err) == context.Canceled { +<<<<<<< HEAD:cdc/sinkv2/eventsink/mq/mq_dml_sink.go if s.cancelErr == nil { return } err = s.cancelErr +======= + err = context.Cause(ctx) +>>>>>>> 0f4a8a1fcb (kafka(ticdc): fix kafka dml sink report error to sink manager (#9879) (#9894)):cdc/sink/dmlsink/mq/mq_dml_sink.go } select { case errCh <- err: