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.

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): reset the admin client to fix broken pipe #8228

Merged
merged 6 commits into from
Feb 11, 2023
Merged
Changes from 1 commit
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
Next Next commit
reset the admin client if meet broken pipe
3AceShowHand committed Feb 10, 2023

Partially verified

This commit is signed with the committer’s verified signature.
spydon’s contribution has been verified via GPG key.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
commit f5b6d5bdc3a46065589b2cc663293b87eb2fd44b
32 changes: 29 additions & 3 deletions pkg/sink/kafka/admin.go
Original file line number Diff line number Diff line change
@@ -15,8 +15,10 @@ package kafka

import (
"context"
"errors"
"strconv"
"strings"
"syscall"

"github.com/Shopify/sarama"
"github.com/pingcap/log"
@@ -25,7 +27,9 @@ import (
)

type saramaAdminClient struct {
client sarama.ClusterAdmin
brokerEndpoints []string
config *sarama.Config
client sarama.ClusterAdmin
}

// NewSaramaAdminClient constructs a ClusterAdminClient with sarama.
@@ -39,7 +43,11 @@ func NewSaramaAdminClient(ctx context.Context, config *Options) (ClusterAdminCli
if err != nil {
return nil, err
}
return &saramaAdminClient{client: client}, nil
return &saramaAdminClient{
client: client,
brokerEndpoints: config.BrokerEndpoints,
config: saramaConfig,
}, nil
}

func (a *saramaAdminClient) GetAllBrokers(context.Context) ([]Broker, error) {
@@ -90,12 +98,30 @@ func (a *saramaAdminClient) GetBrokerConfig(_ context.Context, configName string
return configEntries[0].Value, nil
}

func (a *saramaAdminClient) GetAllTopicsMeta(context.Context) (map[string]TopicDetail, error) {
func (a *saramaAdminClient) getAllTopicsMeta() (map[string]sarama.TopicDetail, error) {
topics, err := a.client.ListTopics()
if err == nil {
return topics, nil
}

if !errors.Is(err, syscall.EPIPE) {
return nil, err
}

client, err := sarama.NewClusterAdmin(a.brokerEndpoints, a.config)
if err != nil {
return nil, err
}

a.client = client
return a.client.ListTopics()
}

func (a *saramaAdminClient) GetAllTopicsMeta(context.Context) (map[string]TopicDetail, error) {
topics, err := a.getAllTopicsMeta()
if err != nil {
return nil, cerror.Trace(err)
}
result := make(map[string]TopicDetail, len(topics))
for topic, detail := range topics {
configEntries := make(map[string]string, len(detail.ConfigEntries))