Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion cmd/kafka-consumer/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ func getPartitionNum(o *option) (int32, error) {
}
return 0, errors.Trace(err)
}
if topicDetail, ok := resp.Topics[topic]; ok {

topicDetail, ok := resp.Topics[topic]
if ok && topicDetail.Error.Code() == kafka.ErrNoError {
numPartitions := int32(len(topicDetail.Partitions))
log.Info("get partition number of topic",
zap.String("topic", topic),
Expand Down
15 changes: 3 additions & 12 deletions downstreamadapter/sink/kafka/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ func (c components) close() {
}
}

func newKafkaSinkComponentWithFactory(ctx context.Context,
func newKafkaSinkComponent(
ctx context.Context,
changefeedID commonType.ChangeFeedID,
sinkURI *url.URL,
sinkConfig *config.SinkConfig,
factoryCreator kafka.FactoryCreator,
) (components, config.Protocol, error) {
kafkaComponent := components{}
protocol, err := helper.GetProtocol(utils.GetOrZero(sinkConfig.Protocol))
Expand All @@ -72,7 +72,7 @@ func newKafkaSinkComponentWithFactory(ctx context.Context,
}
options.Topic = topic

kafkaComponent.factory, err = factoryCreator(ctx, options, changefeedID)
kafkaComponent.factory, err = kafka.NewSaramaFactory(ctx, options, changefeedID)
if err != nil {
return kafkaComponent, protocol, errors.WrapError(errors.ErrKafkaNewProducer, err)
}
Expand Down Expand Up @@ -129,12 +129,3 @@ func newKafkaSinkComponentWithFactory(ctx context.Context,
}
return kafkaComponent, protocol, nil
}

func newKafkaSinkComponent(
ctx context.Context,
changefeedID commonType.ChangeFeedID,
sinkURI *url.URL,
sinkConfig *config.SinkConfig,
) (components, config.Protocol, error) {
return newKafkaSinkComponentWithFactory(ctx, changefeedID, sinkURI, sinkConfig, kafka.NewSaramaFactory)
}
77 changes: 74 additions & 3 deletions downstreamadapter/sink/kafka/sink.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ import (
"time"

"github.com/pingcap/log"
"github.com/pingcap/ticdc/downstreamadapter/sink/columnselector"
"github.com/pingcap/ticdc/downstreamadapter/sink/eventrouter"
"github.com/pingcap/ticdc/downstreamadapter/sink/helper"
commonType "github.com/pingcap/ticdc/pkg/common"
commonEvent "github.com/pingcap/ticdc/pkg/common/event"
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/metrics"
"github.com/pingcap/ticdc/pkg/sink/codec"
"github.com/pingcap/ticdc/pkg/sink/codec/common"
"github.com/pingcap/ticdc/pkg/sink/kafka"
"github.com/pingcap/ticdc/pkg/util"
Expand Down Expand Up @@ -68,9 +71,77 @@ func (s *sink) SinkType() commonType.SinkType {
}

func Verify(ctx context.Context, changefeedID commonType.ChangeFeedID, uri *url.URL, sinkConfig *config.SinkConfig) error {
comp, _, err := newKafkaSinkComponent(ctx, changefeedID, uri, sinkConfig)
defer comp.close()
return err
protocol, err := helper.GetProtocol(util.GetOrZero(sinkConfig.Protocol))
if err != nil {
return errors.Trace(err)
}

topic, err := helper.GetTopic(uri)
if err != nil {
return errors.Trace(err)
}

options := kafka.NewOptions()
if err = options.Apply(changefeedID, uri, sinkConfig); err != nil {
return errors.WrapError(errors.ErrKafkaInvalidConfig, err)
}
options.Topic = topic

encoderConfig, err := helper.GetEncoderConfig(changefeedID, uri, protocol, sinkConfig, options.MaxMessageBytes)
if err != nil {
return errors.Trace(err)
}

isAvroLike := protocol == config.ProtocolAvro || protocol == config.ProtocolDebeziumAvro
if _, err = eventrouter.NewEventRouter(sinkConfig, topic, false, isAvroLike); err != nil {
return errors.Trace(err)
}

if _, err = columnselector.New(sinkConfig); err != nil {
return errors.Trace(err)
}

factory, err := kafka.NewSaramaFactory(ctx, options, changefeedID)
if err != nil {
return errors.WrapError(errors.ErrKafkaNewProducer, err)
}

adminClient, err := factory.AdminClient(ctx)
if err != nil {
return errors.WrapError(errors.ErrKafkaNewProducer, err)
}
defer adminClient.Close()

topics, err := adminClient.GetTopicsMeta([]string{topic}, false)
if err != nil {
return errors.Trace(err)
}
if _, exists := topics[topic]; exists {
return nil
}
Comment thread
3AceShowHand marked this conversation as resolved.

topicConfig := options.DeriveTopicConfig()
if !topicConfig.AutoCreate {
return errors.ErrKafkaInvalidConfig.GenWithStack("`auto-create-topic` is false, and %s not found", topic)
}

// the topic is not created, only validate.
err = adminClient.CreateTopic(&kafka.TopicDetail{
Name: topic,
NumPartitions: topicConfig.PartitionNum,
ReplicationFactor: topicConfig.ReplicationFactor,
}, true)
Comment thread
3AceShowHand marked this conversation as resolved.
if err != nil {
return errors.WrapError(errors.ErrKafkaCreateTopic, err)
}

encoder, err := codec.NewEventEncoder(ctx, encoderConfig)
if err != nil {
return errors.Trace(err)
}
encoder.Clean()

return nil
}

func New(
Expand Down
3 changes: 1 addition & 2 deletions pkg/sink/codec/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/pingcap/log"
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/errors"
cerror "github.com/pingcap/ticdc/pkg/errors"
"github.com/pingcap/ticdc/pkg/sink/codec/avro"
"github.com/pingcap/ticdc/pkg/sink/codec/canal"
"github.com/pingcap/ticdc/pkg/sink/codec/common"
Expand Down Expand Up @@ -62,7 +61,7 @@ func NewEventDecoder(
case config.ProtocolAvro:
schemaM, err := avro.NewConfluentSchemaManager(ctx, codecConfig.AvroConfluentSchemaRegistry, nil)
if err != nil {
return nil, cerror.Trace(err)
return nil, errors.Trace(err)
}
return avro.NewDecoder(codecConfig, idx, schemaM, topic, upstreamTiDB), nil
case config.ProtocolSimple:
Expand Down
4 changes: 0 additions & 4 deletions pkg/sink/kafka/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package kafka
import (
"context"

commonType "github.com/pingcap/ticdc/pkg/common"
"github.com/pingcap/ticdc/pkg/sink/codec/common"
)

Expand All @@ -32,9 +31,6 @@ type Factory interface {
MetricsCollector(adminClient ClusterAdminClient) MetricsCollector
}

// FactoryCreator defines the type of factory creator.
type FactoryCreator func(context.Context, *options, commonType.ChangeFeedID) (Factory, error)

// SyncProducer is the kafka sync producer
type SyncProducer interface {
// SendMessage produces a given message, and returns only when it either has
Expand Down
Loading