This is an automated email from the ASF dual-hosted git repository.
dajac 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 a76e58a8720 KAFKA-20268: Fix merge conflict with KAFKA-20162 (#21707)
a76e58a8720 is described below
commit a76e58a8720514a796aeb7eb330a8db76b85f958
Author: Sean Quah <[email protected]>
AuthorDate: Wed Mar 11 11:42:46 2026 +0000
KAFKA-20268: Fix merge conflict with KAFKA-20162 (#21707)
KAFKA-20268 initializes groups at epoch 1 so that the first observed
member epoch is usually epoch 2. Update the epochs in the tests added by
KAFKA-20162.
Reviewers: Lucas Brutschy <[email protected]>, David Jacot
<[email protected]>
---
.../apache/kafka/coordinator/group/GroupMetadataManagerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
index f0b61be4172..a7a67f4e415 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
@@ -20949,7 +20949,7 @@ public class GroupMetadataManagerTest {
.setRebalanceTimeoutMs(90000)
.setSubscribedTopicNames(List.of("foo"))
.setTopicPartitions(List.of()));
- assertEquals(1, result.response().memberEpoch());
+ assertEquals(2, result.response().memberEpoch());
// Verify default heartbeat interval and session timeout before config
update.
assertEquals(GroupCoordinatorConfig.CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DEFAULT,
@@ -20976,7 +20976,7 @@ public class GroupMetadataManagerTest {
.setGroupId(groupId)
.setMemberId(memberId)
.setMemberEpoch(result.response().memberEpoch()));
- assertEquals(1, result.response().memberEpoch());
+ assertEquals(2, result.response().memberEpoch());
// Verify heartbeat interval is evaluated to min.
assertEquals(GroupCoordinatorConfig.CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
@@ -21025,7 +21025,7 @@ public class GroupMetadataManagerTest {
.setMemberId(memberId)
.setMemberEpoch(0)
.setSubscribedTopicNames(List.of("foo")));
- assertEquals(1, result.response().getKey().memberEpoch());
+ assertEquals(2, result.response().getKey().memberEpoch());
// Verify default heartbeat interval and session timeout before config
update.
assertEquals(GroupCoordinatorConfig.SHARE_GROUP_HEARTBEAT_INTERVAL_MS_DEFAULT,
@@ -21066,7 +21066,7 @@ public class GroupMetadataManagerTest {
.setGroupId(groupId)
.setMemberId(memberId)
.setMemberEpoch(result.response().getKey().memberEpoch()));
- assertEquals(1, result.response().getKey().memberEpoch());
+ assertEquals(2, result.response().getKey().memberEpoch());
// Verify heartbeat interval is evaluated to min.
assertEquals(GroupCoordinatorConfig.SHARE_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT,
