Skip to content

KAFKA-18475: Flaky PlaintextProducerSendTest testCloseWithZeroTimeoutFromCallerThread #20791

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

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
+26 −1
Open

KAFKA-18475: Flaky PlaintextProducerSendTest testCloseWithZeroTimeoutFromCallerThread #20791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3452d00
Catch race condition
jack2012aa Oct 28, 2025
ee77f8a
Accept different ways to force close in test
jack2012aa Oct 29, 2025
1c70834
Fix
jack2012aa Oct 29, 2025
0143fd1
Merge branch 'apache:trunk' into KAFKA-18475
jack2012aa Oct 29, 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
3 changes: 2 additions & 1 deletion clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ void runOnce() {

long currentTimeMs = time.milliseconds();
long pollTimeout = sendProducerData(currentTimeMs);
client.poll(pollTimeout, currentTimeMs);
if (!forceClose)
client.poll(pollTimeout, currentTimeMs);
}

// We handle {@code TransactionalIdAuthorizationException} and {@code ClusterAuthorizationException} by first
Expand Down
24 changes: 24 additions & 0 deletions clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -3588,6 +3590,28 @@ public void testWhenProduceResponseReturnsWithALeaderShipChangeErrorAndNewLeader
}
}

@Test
public void testBatchesSentAfterForceClose() throws InterruptedException {
MockClient spy = spy(client);
Metrics m = new Metrics();
SenderMetricsRegistry senderMetrics = new SenderMetricsRegistry(m);
sender = new Sender(logContext, spy, metadata, this.accumulator, false, MAX_REQUEST_SIZE, ACKS_ALL,
10, senderMetrics, time, REQUEST_TIMEOUT, RETRY_BACKOFF_MS, null);

FutureRecordMetadata future = appendToAccumulator(tp0, 0L, "key", "value");
sender.forceClose();
assertTrue(sender.inFlightBatches(tp0).isEmpty());
reset(spy);
sender.runOnce();
// Either the request is not sent, or the send request is not processed by poll
long sendInvocations = mockingDetails(spy).getInvocations().stream().filter(invocation -> invocation.getMethod().getName().equals("send")).count();
long pollInvocations = mockingDetails(spy).getInvocations().stream().filter(invocation -> invocation.getMethod().getName().equals("poll")).count();
assertTrue(sendInvocations == 0 || pollInvocations == 0, "Message cannot be sent or processed after Sender is forced close");

sender.run();
TestUtils.assertFutureThrows(KafkaException.class, future);
}


private void verifyErrorMessage(ProduceResponse response, String expectedMessage) throws Exception {
Future<RecordMetadata> future = appendToAccumulator(tp0, 0L, "key", "value");
Expand Down