From 7b41eedc1a6ea2f4526cbd66748698eaf5469384 Mon Sep 17 00:00:00 2001 From: TengYao Chi Date: Mon, 4 Nov 2024 04:35:22 +0800 Subject: [PATCH] KAFKA-17909 Remove zkBroker from ConsumerGroupHeartbeatRequest and ConsumerGroupDescribeRequest (#17665) Reviewers: Chia-Ping Tsai --- .../common/message/ConsumerGroupDescribeRequest.json | 2 +- .../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 c1c65ca68470e..a581d15dee326 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 e89a5542d1713..fbe680b208b58 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 c3d299b400a7f..f86a7baea15f6 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)