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

MINOR: Fix the flaky testConsumerGroupHeartbeatWithStableClassicGroup by sorting the topic partition list #15816

Merged
merged 3 commits into from Apr 29, 2024
Merged

MINOR: Fix the flaky testConsumerGroupHeartbeatWithStableClassicGroup by sorting the topic partition list #15816

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c607bd5
ConsumerGroupTargetAssignmentMemberValue and ConsumerGroupCurrentMemb…
dongnuo123 Apr 26, 2024
2c7d495
remove ConsumerGroupCurrentMemberAssignmentValue
dongnuo123 Apr 26, 2024
74326c3
address the comment
dongnuo123 Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 17 additions & 2 deletions group-coordinator/src/test/java/org/apache/kafka/coordinator/group/Assertions.java
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.coordinator.group.generated.ConsumerGroupCurrentMemberAssignmentValue;
import org.apache.kafka.coordinator.group.generated.ConsumerGroupPartitionMetadataValue;
import org.apache.kafka.coordinator.group.generated.ConsumerGroupTargetAssignmentMemberValue;
import org.apache.kafka.coordinator.group.generated.GroupMetadataValue;
import org.apache.kafka.server.common.ApiMessageAndVersion;
import org.opentest4j.AssertionFailedError;
Expand Down Expand Up @@ -211,8 +212,10 @@ private static void assertApiMessageAndVersionEquals(
GroupMetadataValue expectedValue = (GroupMetadataValue) expected.message().duplicate();
GroupMetadataValue actualValue = (GroupMetadataValue) actual.message().duplicate();

expectedValue.members().sort(Comparator.comparing(GroupMetadataValue.MemberMetadata::memberId));
actualValue.members().sort(Comparator.comparing(GroupMetadataValue.MemberMetadata::memberId));
Comparator<GroupMetadataValue.MemberMetadata> comparator =
Comparator.comparing(GroupMetadataValue.MemberMetadata::memberId);
expectedValue.members().sort(comparator);
actualValue.members().sort(comparator);
try {
Arrays.asList(expectedValue, actualValue).forEach(value ->
value.members().forEach(memberMetadata -> {
Expand Down Expand Up @@ -243,6 +246,18 @@ private static void assertApiMessageAndVersionEquals(
} catch (SchemaException ex) {
fail("Failed deserialization: " + ex.getMessage());
}
assertEquals(expectedValue, actualValue);
} else if (actual.message() instanceof ConsumerGroupTargetAssignmentMemberValue) {
ConsumerGroupTargetAssignmentMemberValue expectedValue =
(ConsumerGroupTargetAssignmentMemberValue) expected.message().duplicate();
ConsumerGroupTargetAssignmentMemberValue actualValue =
(ConsumerGroupTargetAssignmentMemberValue) actual.message().duplicate();

Comparator<ConsumerGroupTargetAssignmentMemberValue.TopicPartition> comparator =
Comparator.comparing(ConsumerGroupTargetAssignmentMemberValue.TopicPartition::topicId);
expectedValue.topicPartitions().sort(comparator);
actualValue.topicPartitions().sort(comparator);

assertEquals(expectedValue, actualValue);
} else {
assertEquals(expected.message(), actual.message());
Expand Down