frankvicky commented on code in PR #23687:
URL: https://github.com/apache/kafka/pull/23687#discussion_r4196234900
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerHeartbeatRequestManagerTest.java:
##########
@@ -143,6 +143,31 @@ public void setUp() {
when(coordinatorRequestManager.coordinator()).thenReturn(Optional.of(mock(Node.class)));
}
+ @Test
+ public void testInitialHeartbeatIntervalUsesRequestTimeout() {
+ int requestTimeoutMs = 1000;
+ ConsumerConfig config = new ConsumerConfig(config().originals(
+ Map.of(ConsumerConfig.REQUEST_TIMEOUT_MS_CONFIG,
requestTimeoutMs)));
+ mockJoiningMemberData(DEFAULT_GROUP_INSTANCE_ID);
+ when(membershipManager.shouldHeartbeatNow()).thenReturn(true);
+ try (Metrics metrics = new Metrics(time)) {
+ ConsumerHeartbeatRequestManager manager = new
ConsumerHeartbeatRequestManager(
+ logContext,
+ time,
+ config,
+ coordinatorRequestManager,
+ subscriptions,
+ membershipManager,
+ backgroundEventHandler,
+ metrics);
+
+ assertEquals(0, manager.maximumTimeToWait(time.milliseconds()));
+ NetworkClientDelegate.PollResult result =
manager.poll(time.milliseconds());
+ assertEquals(1, result.unsentRequests.size());
+ assertEquals(requestTimeoutMs, result.timeUntilNextPollMs);
Review Comment:
The new test only asserts that the first `poll()` returns
`timeUntilNextPollMs == requestTimeoutMs`.
The behavior this PR actually fixes is what happens after that first
heartbeat is sent.
While the request is in flight, subsequent `poll()` / `maximumTimeToWait()`
calls should no longer return 0.
That path isn't covered yet.
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/StreamsGroupHeartbeatRequestManagerTest.java:
##########
@@ -270,6 +270,23 @@ public void testConstructWithNullStreamsRebalanceData() {
assertEquals("Streams rebalance data cannot be null",
exception.getMessage());
}
+ @Test
+ public void testInitialHeartbeatIntervalUsesRequestTimeout() {
+ int requestTimeoutMs = 1000;
+
when(coordinatorRequestManager.coordinator()).thenReturn(Optional.of(coordinatorNode));
+ when(membershipManager.state()).thenReturn(MemberState.JOINING);
+
when(membershipManager.shouldNotWaitForHeartbeatInterval()).thenReturn(true);
+
+ ConsumerConfig testConfig =
+ new
ConsumerConfig(config.originals(Map.of(ConsumerConfig.REQUEST_TIMEOUT_MS_CONFIG,
requestTimeoutMs)));
+ StreamsGroupHeartbeatRequestManager heartbeatRequestManager =
createStreamsGroupHeartbeatRequestManager(testConfig);
+
+ assertEquals(0,
heartbeatRequestManager.maximumTimeToWait(time.milliseconds()));
+ NetworkClientDelegate.PollResult result =
heartbeatRequestManager.poll(time.milliseconds());
+ assertEquals(1, result.unsentRequests.size());
+ assertEquals(requestTimeoutMs, result.timeUntilNextPollMs);
Review Comment:
ditto
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java:
##########
@@ -108,6 +108,31 @@ public void setUp() {
when(coordinatorRequestManager.coordinator()).thenReturn(Optional.of(new
Node(1, "localhost", 9999)));
}
+ @Test
+ public void testInitialHeartbeatIntervalUsesRequestTimeout() {
+ int requestTimeoutMs = 5000;
+ ConsumerConfig config = new ConsumerConfig(config().originals(
+ Map.of(ConsumerConfig.REQUEST_TIMEOUT_MS_CONFIG,
requestTimeoutMs)));
+ mockJoiningMemberData();
+ when(membershipManager.shouldHeartbeatNow()).thenReturn(true);
+ try (Metrics metrics = new Metrics(time)) {
+ ShareHeartbeatRequestManager manager = new
ShareHeartbeatRequestManager(
+ logContext,
+ time,
+ config,
+ coordinatorRequestManager,
+ subscriptions,
+ membershipManager,
+ backgroundEventHandler,
+ metrics);
+
+ assertEquals(0, manager.maximumTimeToWait(time.milliseconds()));
+ NetworkClientDelegate.PollResult result =
manager.poll(time.milliseconds());
+ assertEquals(1, result.unsentRequests.size());
+ assertEquals(requestTimeoutMs, result.timeUntilNextPollMs);
Review Comment:
ditto
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
