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

pkg/sink(ticdc): iterate all Kafka configs to support KOP #8893

Merged
merged 4 commits into from
May 7, 2023
Merged

pkg/sink(ticdc): iterate all Kafka configs to support KOP #8893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10f9489
pkg/sink(ticdc): iterate all Kafka configs to support KOP
Rustin170506 May 6, 2023
0ca6d7f
Merge branch 'master' into rustin-patch-kop
ti-chi-bot[bot] May 6, 2023
213b107
Merge branch 'master' into rustin-patch-kop
ti-chi-bot[bot] May 6, 2023
18e31e2
Merge branch 'master' into rustin-patch-kop
ti-chi-bot[bot] May 6, 2023
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
21 changes: 13 additions & 8 deletions pkg/sink/kafka/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,21 @@ func (a *saramaAdminClient) GetBrokerConfig(
return "", err
}

if len(configEntries) == 0 || configEntries[0].Name != configName {
log.Warn("Kafka config item not found",
zap.String("namespace", a.changefeed.Namespace),
zap.String("changefeed", a.changefeed.ID),
zap.String("configName", configName))
return "", cerror.ErrKafkaBrokerConfigNotFound.GenWithStack(
"cannot find the `%s` from the broker's configuration", configName)
// For compatibility with KOP, we checked all return values.
// 1. Kafka only returns requested configs.
// 2. Kop returns all configs.
for _, entry := range configEntries {
if entry.Name == configName {
return entry.Value, nil
}
}

return configEntries[0].Value, nil
log.Warn("Kafka config item not found",
Rustin170506 marked this conversation as resolved.
Show resolved Hide resolved
zap.String("namespace", a.changefeed.Namespace),
zap.String("changefeed", a.changefeed.ID),
zap.String("configName", configName))
return "", cerror.ErrKafkaBrokerConfigNotFound.GenWithStack(
"cannot find the `%s` from the broker's configuration", configName)
}

func (a *saramaAdminClient) GetTopicsPartitions(_ context.Context) (map[string]int32, error) {
Expand Down
20 changes: 12 additions & 8 deletions pkg/sink/kafka/v2/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,25 @@ func (a *admin) GetBrokerConfig(ctx context.Context, configName string) (string,
}

if len(resp.Resources) == 0 || len(resp.Resources[0].ConfigEntries) == 0 {
log.Warn("kafka config item not found",
log.Warn("Kafka config item not found",
zap.String("configName", configName))
return "", errors.ErrKafkaBrokerConfigNotFound.GenWithStack(
"cannot find the `%s` from the broker's configuration", configName)
}

entry := resp.Resources[0].ConfigEntries[0]
if entry.ConfigName != configName {
log.Warn("kafka config item not found",
zap.String("configName", configName))
return "", errors.ErrKafkaBrokerConfigNotFound.GenWithStack(
"cannot find the `%s` from the broker's configuration", configName)
// For compatibility with KOP, we checked all return values.
// 1. Kafka only returns requested configs.
// 2. Kop returns all configs.
for _, entry := range resp.Resources[0].ConfigEntries {
if entry.ConfigName == configName {
return entry.ConfigValue, nil
}
}

return entry.ConfigValue, nil
log.Warn("Kafka config item not found",
zap.String("configName", configName))
return "", errors.ErrKafkaBrokerConfigNotFound.GenWithStack(
"cannot find the `%s` from the broker's configuration", configName)
}

func (a *admin) GetTopicsPartitions(ctx context.Context) (map[string]int32, error) {
Expand Down