Skip to content

MINOR: Followup KAFKA-18193 for null check and error message #20650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 12, 2025
Merged

MINOR: Followup KAFKA-18193 for null check and error message #20650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c231f07
fix null value and error message
m1a2st Oct 7, 2025
0b6f7ba
addressed by comments
m1a2st Oct 7, 2025
01fac52
Merge branch 'trunk' into MINOR-followup-KAFKA-18193
m1a2st Oct 8, 2025
ead8664
use orElseGet to late init
m1a2st Oct 9, 2025
4a3dd61
Merge branch 'trunk' into MINOR-followup-KAFKA-18193
m1a2st Oct 9, 2025
dc2efd3
Merge branch 'trunk' into MINOR-followup-KAFKA-18193
m1a2st Oct 10, 2025
ce65797
add unit test for null timeout
m1a2st Oct 11, 2025
124b8e2
Merge branch 'trunk' into MINOR-followup-KAFKA-18193
m1a2st Oct 11, 2025
111388d
update the test name
m1a2st Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,8 @@ private Thread shutdownHelper(
}, clientId + "-CloseThread");
}

private boolean close(final Optional<Long> timeout, final org.apache.kafka.streams.CloseOptions.GroupMembershipOperation operation) {
// visible for testing
boolean close(final Optional<Long> timeout, final org.apache.kafka.streams.CloseOptions.GroupMembershipOperation operation) {
final long timeoutMs;
if (timeout.isPresent()) {
timeoutMs = timeout.get();
Expand Down Expand Up @@ -1635,8 +1636,9 @@ public synchronized boolean close(final CloseOptions options) throws IllegalArgu
public synchronized boolean close(final org.apache.kafka.streams.CloseOptions options) throws IllegalArgumentException {
Objects.requireNonNull(options, "options cannot be null");
final CloseOptionsInternal optionsInternal = new CloseOptionsInternal(options);
final String msgPrefix = prepareMillisCheckFailMsgPrefix(optionsInternal.timeout(), "timeout");
final long timeoutMs = validateMillisecondDuration(optionsInternal.timeout().get(), msgPrefix);
final Duration timeout = optionsInternal.timeout().orElseGet(() -> Duration.ofMillis(Long.MAX_VALUE));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please add test for empty timeout?

final String msgPrefix = prepareMillisCheckFailMsgPrefix(timeout, "timeout");
final long timeoutMs = validateMillisecondDuration(timeout, msgPrefix);
if (timeoutMs < 0) {
throw new IllegalArgumentException("Timeout can't be negative.");
}
Expand Down
23 changes: 23 additions & 0 deletions streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.isA;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -1297,6 +1298,28 @@ public void shouldThrowOnNegativeTimeoutForCloseWithCloseOptionLeaveGroupTrue()
}
}

@Test
@SuppressWarnings("unchecked")
public void shouldUseDefaultTimeoutForCloseWithNullTimeout() throws Exception {
prepareStreams();
prepareStreamThread(streamThreadOne, 1);
prepareStreamThread(streamThreadTwo, 2);
prepareTerminableThread(streamThreadOne);

final MockClientSupplier mockClientSupplier = spy(MockClientSupplier.class);
when(mockClientSupplier.getAdmin(any())).thenReturn(adminClient);

final CloseOptions closeOptions = CloseOptions.timeout(null)
.withGroupMembershipOperation(CloseOptions.GroupMembershipOperation.LEAVE_GROUP);
final KafkaStreams streams = spy(new KafkaStreamsWithTerminableThread(
getBuilderWithSource().build(), props, mockClientSupplier, time));

doReturn(false).when(streams).close(any(Optional.class), any());
streams.close(closeOptions);

verify(streams).close(eq(Optional.of(Long.MAX_VALUE)), eq(CloseOptions.GroupMembershipOperation.LEAVE_GROUP));
}

@Test
public void shouldNotBlockInCloseWithCloseOptionLeaveGroupTrueForZeroDuration() throws Exception {
prepareStreams();
Expand Down