Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kafka(ticdc): fix kafka dml sink report error to sink manager (#9879) (#9894) #11942

Open
wants to merge 1 commit into
base: release-6.5
Choose a base branch
from
+4 −0
Open

kafka(ticdc): fix kafka dml sink report error to sink manager (#9879) (#9894) #11942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cdc/sinkv2/eventsink/mq/mq_dml_sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@

// Spawn a goroutine to send messages by the worker.
s.wg.Add(1)
go func() {

Check failure on line 114 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

expression in go must be function call

Check failure on line 114 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

expression in go must be function call
defer s.wg.Done()
err := s.alive.worker.run(ctx)

Expand All @@ -123,12 +123,16 @@

if err != nil {
if errors.Cause(err) == context.Canceled {
<<<<<<< HEAD:cdc/sinkv2/eventsink/mq/mq_dml_sink.go

Check failure on line 126 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: unexpected <<, expecting }

Check failure on line 126 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: unexpected <<, expecting }
if s.cancelErr == nil {

Check failure on line 127 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: unexpected if, expecting expression

Check failure on line 127 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

expression in go must be function call

Check failure on line 127 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: unexpected if, expecting expression

Check failure on line 127 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

expression in go must be function call
return
}
err = s.cancelErr
=======

Check failure on line 131 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: unexpected ==, expecting }

Check failure on line 131 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: unexpected ==, expecting }
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

Check failure on line 133 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: unexpected >>, expecting }

Check failure on line 133 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

invalid character U+0023 '#'

Check failure on line 133 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: unexpected >>, expecting }

Check failure on line 133 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

invalid character U+0023 '#'
}

Check failure on line 134 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: unexpected }, expecting expression

Check failure on line 134 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

expression in go must be function call

Check failure on line 134 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: unexpected }, expecting expression

Check failure on line 134 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

expression in go must be function call
select {

Check failure on line 135 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64) 

syntax error: non-declaration statement outside function body

Check failure on line 135 in cdc/sinkv2/eventsink/mq/mq_dml_sink.go

View workflow job for this annotation

GitHub Actions / Mac OS Build 

syntax error: non-declaration statement outside function body
case errCh <- err:
log.Warn("mq dml sink meet error",
zap.String("namespace", s.id.Namespace),
Expand Down
Loading