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

sink(ticdc): set max-message-bytes default to 10m (#4036) #4063

Merged
merged 10 commits into from
Jan 24, 2022
+120 −77
Merged

sink(ticdc): set max-message-bytes default to 10m (#4036) #4063

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a85e7d
This is an automated cherry-pick of #4036
3AceShowHand Dec 24, 2021
036917e
remove config.
3AceShowHand Dec 24, 2021
2dcbbfc
fix kafka.
3AceShowHand Dec 24, 2021
a01549d
This is an automated cherry-pick of #4074
3AceShowHand Dec 26, 2021
3df789e
merge two into 1.
3AceShowHand Jan 20, 2022
39e68bf
Resolve mq.
3AceShowHand Jan 20, 2022
9041476
remove unncessary mock impl.
3AceShowHand Jan 20, 2022
9265ccd
try fix .
3AceShowHand Jan 20, 2022
3f8bfa7
resolve conflict.
3AceShowHand Jan 20, 2022
1ff9176
fix more conflicts.
3AceShowHand Jan 24, 2022
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
Prev Previous commit
fix more conflicts.
@3AceShowHand
3AceShowHand committed Jan 24, 2022
commit 1ff917645a9d48395ffce38401fce75e476956c8
16 changes: 8 additions & 8 deletions cdc/sink/mq_test.go
View file
Original file line number Diff line number Diff line change
@@ -63,10 +63,10 @@ func (s mqSinkSuite) TestKafkaSink(c *check.C) {
opts := map[string]string{}
errCh := make(chan error, 1)

// c.Assert(failpoint.Enable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate", "return(true)"), check.IsNil)
// defer func() {
// _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate")
// }()
c.Assert(failpoint.Enable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate", "return(true)"), check.IsNil)
defer func() {
_ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate")
}()

sink, err := newKafkaSaramaSink(ctx, sinkURI, fr, replicaConfig, opts, errCh)
c.Assert(err, check.IsNil)
@@ -170,10 +170,10 @@ func (s mqSinkSuite) TestKafkaSinkFilter(c *check.C) {
opts := map[string]string{}
errCh := make(chan error, 1)

// c.Assert(failpoint.Enable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate", "return(true)"), check.IsNil)
// defer func() {
// _ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate")
// }()
c.Assert(failpoint.Enable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate", "return(true)"), check.IsNil)
defer func() {
_ = failpoint.Disable("github.com/pingcap/tiflow/cdc/sink/producer/kafka/SkipTopicAutoCreate")
}()

sink, err := newKafkaSaramaSink(ctx, sinkURI, fr, replicaConfig, opts, errCh)
c.Assert(err, check.IsNil)
You are viewing a condensed version of this merge commit. You can view the full changes here.