Skip to content

Commit cd4511c

Browse files
jiafu1115jiafu1115
committed
KAFKA-19784: Update deprecated document and rackId related cases
Signed-off-by: stroller <[email protected]>
1 parent e519fad commit cd4511c

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

‎clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4786,6 +4786,7 @@ public void testDescribeOldAndNewConsumerGroups() throws Exception {
47864786
new MemberDescription(
47874787
"0",
47884788
Optional.empty(),
4789+
Optional.empty(),
47894790
"clientId0",
47904791
"clientHost",
47914792
new MemberAssignment(
@@ -10674,6 +10675,7 @@ private static MemberDescription convertToMemberDescriptions(DescribedGroupMembe
1067410675
MemberAssignment assignment) {
1067510676
return new MemberDescription(member.memberId(),
1067610677
Optional.ofNullable(member.groupInstanceId()),
10678+
Optional.empty(),
1067710679
member.clientId(),
1067810680
member.clientHost(),
1067910681
assignment,

‎clients/src/test/java/org/apache/kafka/clients/admin/MemberDescriptionTest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class MemberDescriptionTest {
3030

3131
private static final String MEMBER_ID = "member_id";
3232
private static final Optional<String> INSTANCE_ID = Optional.of("instanceId");
33+
private static final Optional<String> RACK_ID = Optional.of("rackId");
3334
private static final String CLIENT_ID = "client_id";
3435
private static final String HOST = "host";
3536
private static final MemberAssignment ASSIGNMENT;
@@ -39,6 +40,7 @@ public class MemberDescriptionTest {
3940
ASSIGNMENT = new MemberAssignment(Collections.singleton(new TopicPartition("topic", 1)));
4041
STATIC_MEMBER_DESCRIPTION = new MemberDescription(MEMBER_ID,
4142
INSTANCE_ID,
43+
RACK_ID,
4244
CLIENT_ID,
4345
HOST,
4446
ASSIGNMENT,
@@ -50,6 +52,7 @@ public class MemberDescriptionTest {
5052
@Test
5153
public void testEqualsWithoutGroupInstanceId() {
5254
MemberDescription dynamicMemberDescription = new MemberDescription(MEMBER_ID,
55+
Optional.empty(),
5356
Optional.empty(),
5457
CLIENT_ID,
5558
HOST,
@@ -59,6 +62,7 @@ public void testEqualsWithoutGroupInstanceId() {
5962
Optional.empty());
6063

6164
MemberDescription identityDescription = new MemberDescription(MEMBER_ID,
65+
Optional.empty(),
6266
Optional.empty(),
6367
CLIENT_ID,
6468
HOST,
@@ -83,6 +87,7 @@ public void testEqualsWithGroupInstanceId() {
8387

8488
MemberDescription identityDescription = new MemberDescription(MEMBER_ID,
8589
INSTANCE_ID,
90+
RACK_ID,
8691
CLIENT_ID,
8792
HOST,
8893
ASSIGNMENT,
@@ -98,6 +103,7 @@ public void testEqualsWithGroupInstanceId() {
98103
public void testNonEqual() {
99104
MemberDescription newMemberDescription = new MemberDescription("new_member",
100105
INSTANCE_ID,
106+
RACK_ID,
101107
CLIENT_ID,
102108
HOST,
103109
ASSIGNMENT,
@@ -110,6 +116,7 @@ public void testNonEqual() {
110116

111117
MemberDescription newInstanceDescription = new MemberDescription(MEMBER_ID,
112118
Optional.of("new_instance"),
119+
RACK_ID,
113120
CLIENT_ID,
114121
HOST,
115122
ASSIGNMENT,
@@ -122,6 +129,7 @@ public void testNonEqual() {
122129

123130
MemberDescription newTargetAssignmentDescription = new MemberDescription(MEMBER_ID,
124131
INSTANCE_ID,
132+
RACK_ID,
125133
CLIENT_ID,
126134
HOST,
127135
ASSIGNMENT,
@@ -133,6 +141,7 @@ public void testNonEqual() {
133141

134142
MemberDescription newMemberEpochDescription = new MemberDescription(MEMBER_ID,
135143
INSTANCE_ID,
144+
RACK_ID,
136145
CLIENT_ID,
137146
HOST,
138147
ASSIGNMENT,
@@ -144,6 +153,7 @@ public void testNonEqual() {
144153

145154
MemberDescription newIsClassicDescription = new MemberDescription(MEMBER_ID,
146155
INSTANCE_ID,
156+
RACK_ID,
147157
CLIENT_ID,
148158
HOST,
149159
ASSIGNMENT,

‎clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void testSuccessfulHandleConsumerGroupResponse() {
217217
.setClientHost("host")
218218
.setClientId("clientId")
219219
.setMemberEpoch(10)
220-
.setRackId("rackid")
220+
.setRackId("rackId")
221221
.setSubscribedTopicNames(singletonList("foo"))
222222
.setSubscribedTopicRegex("regex")
223223
.setAssignment(new ConsumerGroupDescribeResponseData.Assignment()
@@ -241,7 +241,7 @@ public void testSuccessfulHandleConsumerGroupResponse() {
241241
.setClientHost("host")
242242
.setClientId("clientId-classic")
243243
.setMemberEpoch(9)
244-
.setRackId("rackid")
244+
.setRackId(null)
245245
.setSubscribedTopicNames(singletonList("bar"))
246246
.setSubscribedTopicRegex("regex")
247247
.setAssignment(new ConsumerGroupDescribeResponseData.Assignment()

‎tools/src/test/java/org/apache/kafka/tools/consumer/group/ConsumerGroupServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void testAdminRequestsForDescribeNegativeOffsets() throws Exception {
142142
true,
143143
Set.of(
144144
new MemberDescription(
145-
"member1", Optional.of("instance1"), "client1", "host1", new MemberAssignment(assignedTopicPartitions),
145+
"member1", Optional.of("instance1"), Optional.of("rackId1"), "client1", "host1", new MemberAssignment(assignedTopicPartitions),
146146
Optional.empty(), Optional.empty(), Optional.empty()
147147
)
148148
),
@@ -259,7 +259,7 @@ protected Admin createAdminClient(Map<String, String> configOverrides) {
259259
@SuppressWarnings("deprecation")
260260
private DescribeConsumerGroupsResult describeGroupsResult(GroupState groupState) {
261261
MemberDescription member1 = new MemberDescription(
262-
"member1", Optional.of("instance1"), "client1", "host1", null,
262+
"member1", Optional.of("instance1"), Optional.of("rackId1"), "client1", "host1", null,
263263
Optional.empty(), Optional.empty(), Optional.empty());
264264
ConsumerGroupDescription description = new ConsumerGroupDescription(GROUP,
265265
true,

‎tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void testDescribeOffsetsOfExistingGroupWithNulls() throws Exception {
245245
DescribeShareGroupsResult describeShareGroupsResult = mock(DescribeShareGroupsResult.class);
246246
ShareGroupDescription exp = new ShareGroupDescription(
247247
firstGroup,
248-
List.of(new ShareMemberDescription("memid1", Optional.of("rackId1"), "clId1", "host1", new ShareMemberAssignment(
248+
List.of(new ShareMemberDescription("memid1", Optional.empty(), "clId1", "host1", new ShareMemberAssignment(
249249
Set.of(new TopicPartition("topic1", 0))
250250
), 0)),
251251
GroupState.STABLE,

0 commit comments

Comments
 (0)