You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ch...@apache.org on 2024/11/03 20:35:29 UTC
(kafka) branch trunk updated: KAFKA-17909 Remove zkBroker from ConsumerGroupHeartbeatRequest and ConsumerGroupDescribeRequest (#17665)
This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7b41eedc1a6 KAFKA-17909 Remove zkBroker from ConsumerGroupHeartbeatRequest and ConsumerGroupDescribeRequest (#17665)
7b41eedc1a6 is described below
commit 7b41eedc1a6ea2f4526cbd66748698eaf5469384
Author: TengYao Chi <ki...@gmail.com>
AuthorDate: Mon Nov 4 04:35:22 2024 +0800
KAFKA-17909 Remove zkBroker from ConsumerGroupHeartbeatRequest and ConsumerGroupDescribeRequest (#17665)
Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
.../main/resources/common/message/ConsumerGroupDescribeRequest.json | 2 +-
.../resources/common/message/ConsumerGroupHeartbeatRequest.json | 2 +-
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/clients/src/main/resources/common/message/ConsumerGroupDescribeRequest.json b/clients/src/main/resources/common/message/ConsumerGroupDescribeRequest.json
index c1c65ca6847..a581d15dee3 100644
--- a/clients/src/main/resources/common/message/ConsumerGroupDescribeRequest.json
+++ b/clients/src/main/resources/common/message/ConsumerGroupDescribeRequest.json
@@ -16,7 +16,7 @@
{
"apiKey": 69,
"type": "request",
- "listeners": ["zkBroker", "broker"],
+ "listeners": ["broker"],
"name": "ConsumerGroupDescribeRequest",
"validVersions": "0",
"flexibleVersions": "0+",
diff --git a/clients/src/main/resources/common/message/ConsumerGroupHeartbeatRequest.json b/clients/src/main/resources/common/message/ConsumerGroupHeartbeatRequest.json
index e89a5542d17..fbe680b208b 100644
--- a/clients/src/main/resources/common/message/ConsumerGroupHeartbeatRequest.json
+++ b/clients/src/main/resources/common/message/ConsumerGroupHeartbeatRequest.json
@@ -16,7 +16,7 @@
{
"apiKey": 68,
"type": "request",
- "listeners": ["zkBroker", "broker"],
+ "listeners": ["broker"],
"name": "ConsumerGroupHeartbeatRequest",
// Version 1 adds SubscribedTopicRegex (KIP-848), and requires the consumer to generate their own Member ID (KIP-1082)
"validVersions": "0-1",
diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
index c3d299b400a..f86a7baea15 100644
--- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
+++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
@@ -11107,7 +11107,8 @@ class KafkaApisTest extends Logging {
val consumerGroupHeartbeatRequest = new ConsumerGroupHeartbeatRequestData().setGroupId("group")
val requestChannelRequest = buildRequest(new ConsumerGroupHeartbeatRequest.Builder(consumerGroupHeartbeatRequest, true).build())
- kafkaApis = createKafkaApis()
+ metadataCache = MetadataCache.kRaftMetadataCache(brokerId, () => KRaftVersion.KRAFT_VERSION_1)
+ kafkaApis = createKafkaApis(raftSupport = true)
kafkaApis.handle(requestChannelRequest, RequestLocal.noCaching)
val expectedHeartbeatResponse = new ConsumerGroupHeartbeatResponseData()
@@ -11249,7 +11250,8 @@ class KafkaApisTest extends Logging {
val expectedDescribedGroup = new DescribedGroup().setGroupId(groupId).setErrorCode(errorCode)
val expectedResponse = new ConsumerGroupDescribeResponseData()
expectedResponse.groups.add(expectedDescribedGroup)
- kafkaApis = createKafkaApis()
+ metadataCache = MetadataCache.kRaftMetadataCache(brokerId, () => KRaftVersion.KRAFT_VERSION_1)
+ kafkaApis = createKafkaApis(raftSupport = true)
kafkaApis.handle(requestChannelRequest, RequestLocal.noCaching)
val response = verifyNoThrottling[ConsumerGroupDescribeResponse](requestChannelRequest)