KAFKA-18687: Setting the subscriptionMetadata during conversion to consumer group #19790
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dajac
added
KIP-848
dongnuo123
commented
May 23, 2025
core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
Outdated
Show resolved
Hide resolved
squah-confluent
approved these changes
May 24, 2025
core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
Outdated
Show resolved
Hide resolved
dajac
reviewed
May 26, 2025
There was a problem hiding this comment.
@dongnuo123 Thanks for the patch. Overall, it looks good to me. I left a few small comments.
core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
Outdated
Show resolved
Hide resolved
| @@ -1576,6 +1581,7 @@ public void testFromClassicGroup() { | |||
| assertEquals(expectedConsumerGroup.groupEpoch(), consumerGroup.groupEpoch()); | |||
| assertEquals(expectedConsumerGroup.state(), consumerGroup.state()); | |||
| assertEquals(expectedConsumerGroup.preferredServerAssignor(), consumerGroup.preferredServerAssignor()); | |||
| assertEquals(Map.copyOf(expectedConsumerGroup.subscriptionMetadata()), Map.copyOf(consumerGroup.subscriptionMetadata())); | |||
There was a problem hiding this comment.
Without it assertEquals just compares the reference.
There was a problem hiding this comment.
Ah, I got it. The issue is that TimelineHashMap does not implement toString. Hence when the comparison fails, you get a cryptic error:
Expected :org.apache.kafka.timeline.TimelineHashMap@17c13
Actual :org.apache.kafka.timeline.TimelineHashMap@308d9
However, it still uses .equals to compare the objects. I am fine with keeping the copy to make it better here.
This reverts commit 738310d.
dajac
approved these changes
May 27, 2025
dajac
pushed a commit
that referenced
this pull request
May 27, 2025
…nsumer group (#19790) When a consumer protocol static member replaces an existing member in a classic group, it's not necessary to recompute the assignment. However, it happens anyway. In [ConsumerGroup.fromClassicGroup](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java#L1140), we don't set the group's subscriptionMetadata. Later in the consumer group heartbeat, we [call updateSubscriptionMetadata](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L1748), which [notices that the group's subscriptionMetadata needs an update](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L2757) and bumps the epoch. Since the epoch is bumped, we [recompute the assignment](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L1766). As a fix, this patch sets the subscriptionMetadata in ConsumerGroup.fromClassicGroup. Reviewers: Sean Quah <[email protected]>, David Jacot <[email protected]>
|
Merged it to trunk and 4.0. |
showuon
pushed a commit
to showuon/kafka
that referenced
this pull request
May 29, 2025
…nsumer group (apache#19790) When a consumer protocol static member replaces an existing member in a classic group, it's not necessary to recompute the assignment. However, it happens anyway. In [ConsumerGroup.fromClassicGroup](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java#L1140), we don't set the group's subscriptionMetadata. Later in the consumer group heartbeat, we [call updateSubscriptionMetadata](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L1748), which [notices that the group's subscriptionMetadata needs an update](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L2757) and bumps the epoch. Since the epoch is bumped, we [recompute the assignment](https://github.com/apache/kafka/blob/0ff4dafb7de4e24ddb7961d52e50e728f2eee4eb/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java#L1766). As a fix, this patch sets the subscriptionMetadata in ConsumerGroup.fromClassicGroup. Reviewers: Sean Quah <[email protected]>, David Jacot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a consumer protocol static member replaces an existing member in a
classic group, it's not necessary to recompute the assignment. However,
it happens anyway.
In
ConsumerGroup.fromClassicGroup,
we don't set the group's subscriptionMetadata. Later in the consumer
group heartbeat, we call
updateSubscriptionMetadata,
which notices that the group's subscriptionMetadata needs an
update
and bumps the epoch. Since the epoch is bumped, we recompute the
assignment.
As a fix, this patch sets the subscriptionMetadata in
ConsumerGroup.fromClassicGroup.
Reviewers: Sean Quah [email protected], David Jacot
[email protected]