You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by "dajac (via GitHub)" <gi...@apache.org> on 2023/07/06 09:12:33 UTC
[GitHub] [kafka] dajac opened a new pull request, #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
dajac opened a new pull request, #13963:
URL: https://github.com/apache/kafka/pull/13963
TODO
### Committer Checklist (excluded from commit message)
- [ ] Verify design and implementation
- [ ] Verify test coverage and CI build status
- [ ] Verify documentation (including upgrade notes)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260159325
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Updates `testRevocationTimeoutLifecycle` to use different timeout values. This ensures that we always use the last one.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259654482
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ // Cancel all the timers of the member.
+ cancelConsumerGroupSessionTimeout(group.groupId(), member.memberId());
+ cancelConsumerGroupRevocationTimeout(group.groupId(), member.memberId());
+
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING ||
+ member.memberEpoch() != expectedMemberEpoch) {
+ log.debug("[GroupId " + groupId + "] Ignoring revocation timeout for " + memberId + " because the member " +
+ "state does not match the expected state.");
+ return Collections.emptyList();
+ }
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "it failed to revoke partitions within {}ms.", revocationTimeoutMs);
Review Comment:
Yeah, that makes sense. Let me update all logging.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259983786
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Where was the bug related to this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258697658
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/MockCoordinatorTimer.java:
##########
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.coordinator.group;
+
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.coordinator.group.runtime.CoordinatorTimer;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.PriorityQueue;
+import java.util.concurrent.TimeUnit;
+
+public class MockCoordinatorTimer<T> implements CoordinatorTimer<T> {
+ public static class ScheduledTimeout<T> {
+ public final String key;
+ public final long deadlineMs;
+ public final TimeoutOperation<T> operation;
+
+ ScheduledTimeout(
+ String key,
+ long deadlineMs,
+ TimeoutOperation<T> operation
+ ) {
+ this.key = key;
+ this.deadlineMs = deadlineMs;
+ this.operation = operation;
+ }
+ }
+
+ public static class ExpiredTimeout<T> {
+ public final String key;
+ public final List<T> records;
+
+ ExpiredTimeout(
+ String key,
+ List<T> records
+ ) {
+ this.key = key;
+ this.records = records;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExpiredTimeout<?> that = (ExpiredTimeout<?>) o;
+
+ if (!Objects.equals(key, that.key)) return false;
+ return Objects.equals(records, that.records);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = key != null ? key.hashCode() : 0;
+ result = 31 * result + (records != null ? records.hashCode() : 0);
+ return result;
+ }
+ }
+
+ private final Time time;
+
+ private final Map<String, ScheduledTimeout<T>> timeoutMap = new HashMap<>();
+ private final PriorityQueue<ScheduledTimeout<T>> timeoutQueue = new PriorityQueue<>(
+ Comparator.comparingLong(entry -> entry.deadlineMs)
+ );
+
+ public MockCoordinatorTimer(Time time) {
+ this.time = time;
+ }
+
+ @Override
+ public void schedule(
+ String key,
+ long delay,
+ TimeUnit unit,
+ boolean retry,
+ TimeoutOperation<T> operation
+ ) {
+ cancel(key);
+
+ long deadlineMs = time.milliseconds() + unit.toMillis(delay);
+ ScheduledTimeout<T> timeout = new ScheduledTimeout<>(key, deadlineMs, operation);
+ timeoutQueue.add(timeout);
+ timeoutMap.put(key, timeout);
+ }
+
+ @Override
+ public void cancel(String key) {
+ ScheduledTimeout<T> timeout = timeoutMap.remove(key);
+ if (timeout != null) {
+ timeoutQueue.remove(timeout);
+ }
+ }
+
+ public boolean contains(String key) {
+ return timeoutMap.containsKey(key);
+ }
+
+ public ScheduledTimeout<T> timeout(String key) {
+ return timeoutMap.get(key);
+ }
+
+ public int size() {
+ return timeoutMap.size();
+ }
+
+ public List<ExpiredTimeout<T>> poll() {
Review Comment:
So we don't expire timeouts until we call this poll?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260035984
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Is there a good way to add a test to ensure this doesn't happen again? Ie, ensure we don't use the old (non-updated) member timeout?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259657044
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -1059,4 +1205,44 @@ public void onNewMetadataImage(MetadataImage newImage, MetadataDelta delta) {
}
});
}
+
+ /**
+ * The coordinator has been loaded. Session timeouts are registered
+ * for all members.
+ */
+ public void onLoaded() {
+ groups.forEach((groupId, group) -> {
+ switch (group.type()) {
+ case CONSUMER:
+ ConsumerGroup consumerGroup = (ConsumerGroup) group;
+ log.info("Loaded consumer group {} with {} members.", groupId, consumerGroup.members().size());
+ consumerGroup.members().forEach((memberId, member) -> {
+ log.debug("Loaded member {} in consumer group {}.", memberId, groupId);
+ scheduleConsumerGroupSessionTimeout(groupId, memberId);
+ if (member.state() == ConsumerGroupMember.MemberState.REVOKING) {
+ scheduleConsumerGroupRevocationTimeout(
+ groupId,
+ memberId,
+ member.rebalanceTimeoutMs(),
+ member.memberEpoch()
+ );
+ }
+ });
+ break;
+
+ case GENERIC:
+ GenericGroup genericGroup = (GenericGroup) group;
+ log.info("Loaded generic group {} with {} members.", groupId, genericGroup.allMembers().size());
Review Comment:
I will you complete this part. I think that we need to log each members as I did. We also need to schedule the session timeouts here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260243479
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2798,8 +2798,6 @@ public void testRevocationTimeoutLifecycle() {
.setGroupId(groupId)
.setMemberId(memberId1)
.setMemberEpoch(1)
- .setRebalanceTimeoutMs(90000)
Review Comment:
it must be in first request or when changed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260243017
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2798,8 +2798,6 @@ public void testRevocationTimeoutLifecycle() {
.setGroupId(groupId)
.setMemberId(memberId1)
.setMemberEpoch(1)
- .setRebalanceTimeoutMs(90000)
Review Comment:
it was not needed so removed it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258653960
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING &&
+ member.memberEpoch() != expectedMemberEpoch) {
Review Comment:
We continue to revoke even if the epoch is unexpected? Also do we want to return early here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259656449
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
Review Comment:
They don't rely on the group epoch. Members are only fenced by on their member epoch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258664011
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
Review Comment:
It is actually the other way around. We catch those exceptions because we don't want to retry them. If the member does not exist or if the group does not exist, it means that the timer is stale. This should normally not happen because the timers should be cancelled when a member is removed and a group cannot be deleted if not empty. The API to delete a group is not implemented yet but will come soon.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259645303
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Good catch. It should not be ignored. Fixed a bug related to this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258683353
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING &&
+ member.memberEpoch() != expectedMemberEpoch) {
Review Comment:
Do we have a test for this case?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258682428
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
Review Comment:
That's correct.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260533220
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
Review Comment:
should we add a test case for revocation/session timeouts `onLoaded()`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258697658
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/MockCoordinatorTimer.java:
##########
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.coordinator.group;
+
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.coordinator.group.runtime.CoordinatorTimer;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.PriorityQueue;
+import java.util.concurrent.TimeUnit;
+
+public class MockCoordinatorTimer<T> implements CoordinatorTimer<T> {
+ public static class ScheduledTimeout<T> {
+ public final String key;
+ public final long deadlineMs;
+ public final TimeoutOperation<T> operation;
+
+ ScheduledTimeout(
+ String key,
+ long deadlineMs,
+ TimeoutOperation<T> operation
+ ) {
+ this.key = key;
+ this.deadlineMs = deadlineMs;
+ this.operation = operation;
+ }
+ }
+
+ public static class ExpiredTimeout<T> {
+ public final String key;
+ public final List<T> records;
+
+ ExpiredTimeout(
+ String key,
+ List<T> records
+ ) {
+ this.key = key;
+ this.records = records;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExpiredTimeout<?> that = (ExpiredTimeout<?>) o;
+
+ if (!Objects.equals(key, that.key)) return false;
+ return Objects.equals(records, that.records);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = key != null ? key.hashCode() : 0;
+ result = 31 * result + (records != null ? records.hashCode() : 0);
+ return result;
+ }
+ }
+
+ private final Time time;
+
+ private final Map<String, ScheduledTimeout<T>> timeoutMap = new HashMap<>();
+ private final PriorityQueue<ScheduledTimeout<T>> timeoutQueue = new PriorityQueue<>(
+ Comparator.comparingLong(entry -> entry.deadlineMs)
+ );
+
+ public MockCoordinatorTimer(Time time) {
+ this.time = time;
+ }
+
+ @Override
+ public void schedule(
+ String key,
+ long delay,
+ TimeUnit unit,
+ boolean retry,
+ TimeoutOperation<T> operation
+ ) {
+ cancel(key);
+
+ long deadlineMs = time.milliseconds() + unit.toMillis(delay);
+ ScheduledTimeout<T> timeout = new ScheduledTimeout<>(key, deadlineMs, operation);
+ timeoutQueue.add(timeout);
+ timeoutMap.put(key, timeout);
+ }
+
+ @Override
+ public void cancel(String key) {
+ ScheduledTimeout<T> timeout = timeoutMap.remove(key);
+ if (timeout != null) {
+ timeoutQueue.remove(timeout);
+ }
+ }
+
+ public boolean contains(String key) {
+ return timeoutMap.containsKey(key);
+ }
+
+ public ScheduledTimeout<T> timeout(String key) {
+ return timeoutMap.get(key);
+ }
+
+ public int size() {
+ return timeoutMap.size();
+ }
+
+ public List<ExpiredTimeout<T>> poll() {
Review Comment:
So we don't expire timeouts until we call this poll? Also in general, can we add a few more comments about this class and it usage?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260017274
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Right [here](https://github.com/apache/kafka/pull/13963/commits/739709aea23512e14abb6f886e3e38e3f814ac5e#diff-00f0f81cf13e66781777d94f7d2e68a581663385c37e98792507f2294c91bb09R690).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac merged pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac merged PR #13963:
URL: https://github.com/apache/kafka/pull/13963
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258644974
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
Review Comment:
based on the previous pr, we retry these exceptions. I can imagine that some metadata was slow to update or something and eventually it could succeed. Do we have any path forward though if this request was issued and the group/member is no longer there? I guess this relying on canceling the task when we call group leave for the member? Do we have a method also to remove groups?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258644974
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
Review Comment:
based on the previous pr, we retry these exceptions. I can imagine that some metadata was slow to update or something and eventually it could succeed. Do we have any path forward though if this request was issued and the group/member is no longer there? I guess this relying on canceling the task when we call group leave for the member?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258669748
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING &&
+ member.memberEpoch() != expectedMemberEpoch) {
Review Comment:
good catch. i should have used an OR in the condition.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258681834
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
Review Comment:
Oh I see. We only catch the exceptions in the other PR if they are thrown (not caught) here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260618876
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
Review Comment:
> i'm a bit confused - if the timer advances by heartbeat interval then shouldn't the existing session timeout expire?
The session timeout expires based on the session timeout not the heartbeat interval, right?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] CalvinConfluent commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "CalvinConfluent (via GitHub)" <gi...@apache.org>.
CalvinConfluent commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259133929
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
Curious there are two different rebalance timeouts set for member 1. One is 10000, one is 90000. Then later at line 2951 when we test the timeout, we use the 10000. Why do we use 2 timeouts here? Is 90000 ignored the correct behavior?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260099305
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,584 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is rescheduled on second heartbeat.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(result.response().memberEpoch()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Session timer is cancelled on leave.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(-1));
+ assertEquals(-1, result.response().memberEpoch());
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testSessionTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time past the session timeout.
+ List<MockCoordinatorTimer.ExpiredTimeout<Record>> timeouts = context.sleep(45000 + 1);
+
+ // Verify the expired timeout.
+ assertEquals(
+ Collections.singletonList(new MockCoordinatorTimer.ExpiredTimeout<Record>(
+ consumerGroupSessionTimeoutKey(groupId, memberId),
+ Arrays.asList(
+ RecordHelpers.newCurrentAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newTargetAssignmentTombstoneRecord(groupId, memberId),
+ RecordHelpers.newMemberSubscriptionTombstoneRecord(groupId, memberId),
+ RecordHelpers.newGroupSubscriptionMetadataRecord(groupId, Collections.emptyMap()),
+ RecordHelpers.newGroupEpochRecord(groupId, 2)
+ )
+ )),
+ timeouts
+ );
+
+ // Verify that there are no timers.
+ context.assertNoSessionTimeout(groupId, memberId);
+ context.assertNoRevocationTimeout(groupId, memberId);
+ }
+
+ @Test
+ public void testRevocationTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+ String memberId3 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout.
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ put(memberId3, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 1)
+ )));
+ }
+ }
+ ));
+
+ // Member 3 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId3)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId3)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(1))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and re-transitions to revoking. The revocation timeout
+ // is re-scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo")));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is a revocation timeout. Keep a reference
+ // to the timeout for later.
+ MockCoordinatorTimer.ScheduledTimeout<Record> scheduledTimeout =
+ context.assertRevocationTimeout(groupId, memberId1, 90000);
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 acks the revocation. The revocation timeout is cancelled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.singletonList(new ConsumerGroupHeartbeatRequestData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Collections.singletonList(0)))));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(3)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0))))),
+ result.response()
+ );
+
+ // Verify that there is not revocation timeout.
+ context.assertNoRevocationTimeout(groupId, memberId1);
+
+ // Execute the scheduled revocation timeout captured earlier to simulate a
+ // stale timeout. This should be a no-op.
+ assertEquals(Collections.emptyList(), scheduledTimeout.operation.generateRecords());
+ }
+
+ @Test
+ public void testRevocationTimeoutExpiration() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId1 = Uuid.randomUuid().toString();
+ String memberId2 = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 3)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 1 joins the group.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000) // Use timeout smaller than session timeout.
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setAssignedTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(0, 1, 2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Prepare next assignment.
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ new HashMap<String, MemberAssignment>() {
+ {
+ put(memberId1, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1)
+ )));
+ put(memberId2, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 2)
+ )));
+ }
+ }
+ ));
+
+ // Member 2 joins the group.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId2)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(10000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+
+ assertResponseEquals(
+ new ConsumerGroupHeartbeatResponseData()
+ .setMemberId(memberId2)
+ .setMemberEpoch(2)
+ .setHeartbeatIntervalMs(5000)
+ .setAssignment(new ConsumerGroupHeartbeatResponseData.Assignment()
+ .setPendingTopicPartitions(Arrays.asList(
+ new ConsumerGroupHeartbeatResponseData.TopicPartitions()
+ .setTopicId(fooTopicId)
+ .setPartitions(Arrays.asList(2))))),
+ result.response()
+ );
+
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
+
+ // Member 1 heartbeats and transitions to revoking. The revocation timeout
+ // is scheduled.
+ result = context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId1)
+ .setMemberEpoch(1)
+ .setRebalanceTimeoutMs(90000)
Review Comment:
I think that I can update this test to cover this. I will do it shortly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260232815
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2798,8 +2798,6 @@ public void testRevocationTimeoutLifecycle() {
.setGroupId(groupId)
.setMemberId(memberId1)
.setMemberEpoch(1)
- .setRebalanceTimeoutMs(90000)
Review Comment:
why did we remove this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259639025
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/MockCoordinatorTimer.java:
##########
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.coordinator.group;
+
+import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.coordinator.group.runtime.CoordinatorTimer;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.PriorityQueue;
+import java.util.concurrent.TimeUnit;
+
+public class MockCoordinatorTimer<T> implements CoordinatorTimer<T> {
+ public static class ScheduledTimeout<T> {
+ public final String key;
+ public final long deadlineMs;
+ public final TimeoutOperation<T> operation;
+
+ ScheduledTimeout(
+ String key,
+ long deadlineMs,
+ TimeoutOperation<T> operation
+ ) {
+ this.key = key;
+ this.deadlineMs = deadlineMs;
+ this.operation = operation;
+ }
+ }
+
+ public static class ExpiredTimeout<T> {
+ public final String key;
+ public final List<T> records;
+
+ ExpiredTimeout(
+ String key,
+ List<T> records
+ ) {
+ this.key = key;
+ this.records = records;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExpiredTimeout<?> that = (ExpiredTimeout<?>) o;
+
+ if (!Objects.equals(key, that.key)) return false;
+ return Objects.equals(records, that.records);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = key != null ? key.hashCode() : 0;
+ result = 31 * result + (records != null ? records.hashCode() : 0);
+ return result;
+ }
+ }
+
+ private final Time time;
+
+ private final Map<String, ScheduledTimeout<T>> timeoutMap = new HashMap<>();
+ private final PriorityQueue<ScheduledTimeout<T>> timeoutQueue = new PriorityQueue<>(
+ Comparator.comparingLong(entry -> entry.deadlineMs)
+ );
+
+ public MockCoordinatorTimer(Time time) {
+ this.time = time;
+ }
+
+ @Override
+ public void schedule(
+ String key,
+ long delay,
+ TimeUnit unit,
+ boolean retry,
+ TimeoutOperation<T> operation
+ ) {
+ cancel(key);
+
+ long deadlineMs = time.milliseconds() + unit.toMillis(delay);
+ ScheduledTimeout<T> timeout = new ScheduledTimeout<>(key, deadlineMs, operation);
+ timeoutQueue.add(timeout);
+ timeoutMap.put(key, timeout);
+ }
+
+ @Override
+ public void cancel(String key) {
+ ScheduledTimeout<T> timeout = timeoutMap.remove(key);
+ if (timeout != null) {
+ timeoutQueue.remove(timeout);
+ }
+ }
+
+ public boolean contains(String key) {
+ return timeoutMap.containsKey(key);
+ }
+
+ public ScheduledTimeout<T> timeout(String key) {
+ return timeoutMap.get(key);
+ }
+
+ public int size() {
+ return timeoutMap.size();
+ }
+
+ public List<ExpiredTimeout<T>> poll() {
Review Comment:
Added some javadoc.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258688221
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING &&
+ member.memberEpoch() != expectedMemberEpoch) {
Review Comment:
I just extended `testRevocationTimeoutLifecycle` to execute a stale timer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259142145
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ // Cancel all the timers of the member.
+ cancelConsumerGroupSessionTimeout(group.groupId(), member.memberId());
+ cancelConsumerGroupRevocationTimeout(group.groupId(), member.memberId());
+
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING ||
+ member.memberEpoch() != expectedMemberEpoch) {
+ log.debug("[GroupId " + groupId + "] Ignoring revocation timeout for " + memberId + " because the member " +
+ "state does not match the expected state.");
+ return Collections.emptyList();
+ }
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "it failed to revoke partitions within {}ms.", revocationTimeoutMs);
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Schedules the revocation timeout of the member.
Review Comment:
nit: Cancels
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -1059,4 +1205,44 @@ public void onNewMetadataImage(MetadataImage newImage, MetadataDelta delta) {
}
});
}
+
+ /**
+ * The coordinator has been loaded. Session timeouts are registered
+ * for all members.
+ */
+ public void onLoaded() {
+ groups.forEach((groupId, group) -> {
+ switch (group.type()) {
+ case CONSUMER:
+ ConsumerGroup consumerGroup = (ConsumerGroup) group;
+ log.info("Loaded consumer group {} with {} members.", groupId, consumerGroup.members().size());
+ consumerGroup.members().forEach((memberId, member) -> {
+ log.debug("Loaded member {} in consumer group {}.", memberId, groupId);
+ scheduleConsumerGroupSessionTimeout(groupId, memberId);
+ if (member.state() == ConsumerGroupMember.MemberState.REVOKING) {
+ scheduleConsumerGroupRevocationTimeout(
+ groupId,
+ memberId,
+ member.rebalanceTimeoutMs(),
+ member.memberEpoch()
+ );
+ }
+ });
+ break;
+
+ case GENERIC:
+ GenericGroup genericGroup = (GenericGroup) group;
+ log.info("Loaded generic group {} with {} members.", groupId, genericGroup.allMembers().size());
Review Comment:
ah i guess this should suffice for generic group loading log.
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ // Cancel all the timers of the member.
+ cancelConsumerGroupSessionTimeout(group.groupId(), member.memberId());
+ cancelConsumerGroupRevocationTimeout(group.groupId(), member.memberId());
+
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING ||
+ member.memberEpoch() != expectedMemberEpoch) {
+ log.debug("[GroupId " + groupId + "] Ignoring revocation timeout for " + memberId + " because the member " +
+ "state does not match the expected state.");
+ return Collections.emptyList();
+ }
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "it failed to revoke partitions within {}ms.", revocationTimeoutMs);
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
Review Comment:
do we actually throw this exception anywhere?
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
Review Comment:
so that i understand, the group epoch will be incremented when we replay the records that were committed to the log.
after an epoch bump, what happens to the timeouts, are all members fenced or do they not rely on the group epoch?
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ // Cancel all the timers of the member.
+ cancelConsumerGroupSessionTimeout(group.groupId(), member.memberId());
+ cancelConsumerGroupRevocationTimeout(group.groupId(), member.memberId());
+
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING ||
+ member.memberEpoch() != expectedMemberEpoch) {
+ log.debug("[GroupId " + groupId + "] Ignoring revocation timeout for " + memberId + " because the member " +
+ "state does not match the expected state.");
+ return Collections.emptyList();
+ }
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "it failed to revoke partitions within {}ms.", revocationTimeoutMs);
Review Comment:
should we use `{}` for all variables? i see this across all other logging as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] dajac commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "dajac (via GitHub)" <gi...@apache.org>.
dajac commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1259655653
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +764,121 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ // Cancel all the timers of the member.
+ cancelConsumerGroupSessionTimeout(group.groupId(), member.memberId());
+ cancelConsumerGroupRevocationTimeout(group.groupId(), member.memberId());
+
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING ||
+ member.memberEpoch() != expectedMemberEpoch) {
+ log.debug("[GroupId " + groupId + "] Ignoring revocation timeout for " + memberId + " because the member " +
+ "state does not match the expected state.");
+ return Collections.emptyList();
+ }
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "it failed to revoke partitions within {}ms.", revocationTimeoutMs);
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
Review Comment:
`group.getOrMaybeCreateMember` throws it if the member does not exist.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260535581
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
Review Comment:
i'm a bit confused - if the timer advances by heartbeat interval then shouldn't the existing session timeout expire?
or is the member removed from the group after this block?
i think it would also be good to assertSessionTimeout after advancing the clock.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260536510
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
Review Comment:
looking at the other test it looks like we expire when we pass the deadline and not at exactly the deadline. should we assert that the timeout still exists and the member is still part of the group?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260536510
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
+ String groupId = "fooup";
+ // Use a static member id as it makes the test easier.
+ String memberId = Uuid.randomUuid().toString();
+
+ Uuid fooTopicId = Uuid.randomUuid();
+ String fooTopicName = "foo";
+
+ MockPartitionAssignor assignor = new MockPartitionAssignor("range");
+ GroupMetadataManagerTestContext context = new GroupMetadataManagerTestContext.Builder()
+ .withAssignors(Collections.singletonList(assignor))
+ .withMetadataImage(new MetadataImageBuilder()
+ .addTopic(fooTopicId, fooTopicName, 6)
+ .build())
+ .build();
+
+ assignor.prepareGroupAssignment(new GroupAssignment(
+ Collections.singletonMap(memberId, new MemberAssignment(mkAssignment(
+ mkTopicAssignment(fooTopicId, 0, 1, 2, 3, 4, 5)
+ )))
+ ));
+
+ // Session timer is scheduled on first heartbeat.
+ CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> result =
+ context.consumerGroupHeartbeat(
+ new ConsumerGroupHeartbeatRequestData()
+ .setGroupId(groupId)
+ .setMemberId(memberId)
+ .setMemberEpoch(0)
+ .setRebalanceTimeoutMs(90000)
+ .setSubscribedTopicNames(Collections.singletonList("foo"))
+ .setTopicPartitions(Collections.emptyList()));
+ assertEquals(1, result.response().memberEpoch());
+
+ // Verify that there is a session time.
+ context.assertSessionTimeout(groupId, memberId, 45000);
+
+ // Advance time.
+ assertEquals(
+ Collections.emptyList(),
+ context.sleep(result.response().heartbeatIntervalMs())
+ );
Review Comment:
looking at the other test it looks like we expire when we pass the deadline and not at exactly the deadline.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jeffkbkim commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jeffkbkim (via GitHub)" <gi...@apache.org>.
jeffkbkim commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1260533220
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java:
##########
@@ -2402,6 +2448,580 @@ public void testOnNewMetadataImage() {
assertEquals(image, context.groupMetadataManager.image());
}
+ @Test
+ public void testSessionTimeoutLifecycle() {
Review Comment:
should we add a test case for revocation/session timeouts `onLoaded()`?
nvm - looks like we already have one :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258650248
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -700,17 +726,36 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
String groupId,
String memberId
) throws ApiException {
- List<Record> records = new ArrayList<>();
-
ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
log.info("[GroupId " + groupId + "] Member " + memberId + " left the consumer group.");
+ List<Record> records = consumerGroupFenceMember(group, member);
+ cancelConsumerGroupSessionTimeout(groupId, memberId);
Review Comment:
would we also want to cancel the revocation timeout?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] jolshan commented on a diff in pull request #13963: KAFKA-14462; [22/N] Implement session and revocation timeouts
Posted by "jolshan (via GitHub)" <gi...@apache.org>.
jolshan commented on code in PR #13963:
URL: https://github.com/apache/kafka/pull/13963#discussion_r1258653960
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupMetadataManager.java:
##########
@@ -720,19 +765,116 @@ private CoordinatorResult<ConsumerGroupHeartbeatResponseData, Record> consumerGr
);
if (!subscriptionMetadata.equals(group.subscriptionMetadata())) {
- log.info("[GroupId " + groupId + "] Computed new subscription metadata: "
+ log.info("[GroupId " + group.groupId() + "] Computed new subscription metadata: "
+ subscriptionMetadata + ".");
- records.add(newGroupSubscriptionMetadataRecord(groupId, subscriptionMetadata));
+ records.add(newGroupSubscriptionMetadataRecord(group.groupId(), subscriptionMetadata));
}
// We bump the group epoch.
int groupEpoch = group.groupEpoch() + 1;
- records.add(newGroupEpochRecord(groupId, groupEpoch));
+ records.add(newGroupEpochRecord(group.groupId(), groupEpoch));
- return new CoordinatorResult<>(records, new ConsumerGroupHeartbeatResponseData()
- .setMemberId(memberId)
- .setMemberEpoch(-1)
- );
+ return records;
+ }
+
+ /**
+ * Schedules (or reschedules) the session timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void scheduleConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ String key = consumerGroupSessionTimeoutKey(groupId, memberId);
+ timer.schedule(key, consumerGroupSessionTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ log.info("[GroupId " + groupId + "] Member " + memberId + " fenced from the group because " +
+ "its session expired.");
+
+ return consumerGroupFenceMember(group, member);
+ } catch (GroupIdNotFoundException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the group " +
+ "does not exist.");
+ } catch (UnknownMemberIdException ex) {
+ log.debug("[GroupId " + groupId + "] Could not fence " + memberId + " because the member " +
+ "does not exist.");
+ }
+
+ return Collections.emptyList();
+ });
+ }
+
+ /**
+ * Cancels the session timeout of the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ */
+ private void cancelConsumerGroupSessionTimeout(
+ String groupId,
+ String memberId
+ ) {
+ timer.cancel(consumerGroupSessionTimeoutKey(groupId, memberId));
+ }
+
+ /**
+ * Schedules a revocation timeout for the member.
+ *
+ * @param groupId The group id.
+ * @param memberId The member id.
+ * @param revocationTimeoutMs The revocation timeout.
+ * @param expectedMemberEpoch The expected member epoch.
+ */
+ private void scheduleConsumerGroupRevocationTimeout(
+ String groupId,
+ String memberId,
+ long revocationTimeoutMs,
+ int expectedMemberEpoch
+ ) {
+ String key = consumerGroupRevocationTimeoutKey(groupId, memberId);
+ timer.schedule(key, revocationTimeoutMs, TimeUnit.MILLISECONDS, true, () -> {
+ try {
+ ConsumerGroup group = getOrMaybeCreateConsumerGroup(groupId, false);
+ ConsumerGroupMember member = group.getOrMaybeCreateMember(memberId, false);
+
+ if (member.state() != ConsumerGroupMember.MemberState.REVOKING &&
+ member.memberEpoch() != expectedMemberEpoch) {
Review Comment:
We continue to revoke even if the epoch is unexpected?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org