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

Jump to bottom

chore(ticdc): bump sarama to 1.36.0 to support kafka 3.x #7113

Merged
merged 8 commits into from
Sep 26, 2022
Merged

chore(ticdc): bump sarama to 1.36.0 to support kafka 3.x #7113

merged 8 commits into from
Sep 26, 2022

Conversation

3AceShowHand
Copy link
Contributor

@3AceShowHand 3AceShowHand commented Sep 19, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #7191

What is changed and how it works?

bump sarama to v1.36.0 to support Kafka 3.x

we use sarama as the kafka client, by it's release note:

Check List

Tests

  • Manual test (add detailed scripts or steps below)

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note 

bump sarama to v1.36.0 and announce support Kafka 3.x

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 19, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hi-rustin
  • zhaoxinyu

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 19, 2022
@3AceShowHand 3AceShowHand changed the title [DNM] chore(ticdc0: bump sarama to 1.36.0 to support kafka 3.x [DNM] chore(ticdc): bump sarama to 1.36.0 to support kafka 3.x Sep 19, 2022
@3AceShowHand 3AceShowHand changed the title [DNM] chore(ticdc): bump sarama to 1.36.0 to support kafka 3.x chore(ticdc): bump sarama to 1.36.0 to support kafka 3.x Sep 22, 2022
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 22, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 23, 2022
@3AceShowHand
Copy link
Contributor Author

/run-all-tests

@3AceShowHand
Copy link
Contributor Author

/run-verify-ci
/run-engine-integration-test

zhaoxinyu
zhaoxinyu reviewed Sep 26, 2022
View reviewed changes
cdc/sink/mq/manager/kafka_manager.go Outdated
@@ -142,7 +142,7 @@ func (m *kafkaTopicManager) getMetadataOfTopics() ([]*sarama.TopicMetadata, erro
topicMetaList, err := m.admin.DescribeTopics(topicList)
if err != nil {
log.Warn(
"Kafka admin client describe topics failed",
"kafka: get topics meta failed",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this log is supposed to be modified, line 153 should also be changed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there is a reason to change this. But it's Ok.
By the way, usually, the log is a sentence, so it should be capitalized at the beginning.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've revert the log.

I think the log is not informative at the first glance, because describe is not a intuitive verb.

In the whole code base, most of the log is not capitalized as a sentence, I would prefer not to capitalize it to unify the convention.

@zhaoxinyu
Copy link
Contributor

Rest LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 26, 2022
Rustin170506
Rustin170506 approved these changes Sep 26, 2022
View reviewed changes
Copy link
Member

@Rustin170506 Rustin170506 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

cdc/sink/mq/manager/kafka_manager.go Outdated
@@ -142,7 +142,7 @@ func (m *kafkaTopicManager) getMetadataOfTopics() ([]*sarama.TopicMetadata, erro
topicMetaList, err := m.admin.DescribeTopics(topicList)
if err != nil {
log.Warn(
"Kafka admin client describe topics failed",
"kafka: get topics meta failed",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there is a reason to change this. But it's Ok.
By the way, usually, the log is a sentence, so it should be capitalized at the beginning.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 26, 2022
@3AceShowHand
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 11d65c5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 26, 2022
@ti-chi-bot
Copy link
Member

@3AceShowHand: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit cd1064a into pingcap:master Sep 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rustin170506 Rustin170506 Rustin170506 approved these changes

@zhaoxinyu zhaoxinyu zhaoxinyu approved these changes

@asddongmen asddongmen Awaiting requested review from asddongmen

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

TiCDC support Kafka 3.x
4 participants
@3AceShowHand @ti-chi-bot @zhaoxinyu @Rustin170506