Skip to content
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

KAFKA-15555: Ensure wakeups are handled correctly in poll() #14746

Merged
merged 12 commits into from
Nov 23, 2023
Merged

KAFKA-15555: Ensure wakeups are handled correctly in poll() #14746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ca61060
KAFKA-15555: Ensure wakeups are handled correctly in PrototypeAsyncCo…
cadonna Nov 13, 2023
6defbb8
Use fetch buffer mock in tests
cadonna Nov 21, 2023
ec502c2
Comment out tests
cadonna Nov 21, 2023
2415ade
Fix checkstyle errors
cadonna Nov 21, 2023
fd627a5
Enable AsyncKafkaConsumerTest to investigate OOM error
cadonna Nov 22, 2023
a51a794
Enable FetchBufferTest to investigate OOM on Jenkins
cadonna Nov 22, 2023
adce2bc
Enable WakeupTriggerTest to investigate OOM error on Jenkins
cadonna Nov 22, 2023
cfa2abd
Enable all client tests to investigate OOM error on Jenkins
cadonna Nov 22, 2023
1cc2352
Disable WakeupTriggerTest and FetchBufferTest to investigate OOM erro…
cadonna Nov 22, 2023
01cf427
Re-enable all tests
cadonna Nov 22, 2023
b796c5b
Extend and use mock infra
cadonna Nov 22, 2023
300498a
Re-enable all tests
cadonna Nov 22, 2023
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
Prev Previous commit
Next Next commit
Enable FetchBufferTest to investigate OOM on Jenkins
  • Loading branch information
@cadonna
cadonna committed Nov 22, 2023
commit a51a794f659bb8fe937b0cd2286bd69843750530
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def isChangeRequest(env) {
env.CHANGE_ID != null && !env.CHANGE_ID.isEmpty()
}

def doTest(env, target = "clients:test --tests org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumerTest") {
def doTest(env, target = "clients:test --tests org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumerTest --tests org.apache.kafka.clients.consumer.internals.FetchBufferTest") {
sh """./gradlew -PscalaVersion=$SCALA_VERSION ${target} \
--profile --continue -PkeepAliveMode="session" -PtestLoggingEvents=started,passed,skipped,failed \
-PignoreFailures=true -PmaxParallelForks=2 -PmaxTestRetries=1 -PmaxTestRetryFailures=10"""
Expand Down
28 changes: 15 additions & 13 deletions clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Properties;
Expand Down Expand Up @@ -171,19 +173,19 @@ public void testAddAllAndRetainAll() {
}
}

// @Test
// public void testWakeup() throws Exception {
// try (FetchBuffer fetchBuffer = new FetchBuffer(logContext)) {
// final Thread waitingThread = new Thread(() -> {
// final Timer timer = time.timer(Duration.ofMinutes(1));
// fetchBuffer.awaitNotEmpty(timer);
// });
// waitingThread.start();
// fetchBuffer.wakeup();
// waitingThread.join(Duration.ofSeconds(30).toMillis());
// assertFalse(waitingThread.isAlive());
// }
// }
@Test
public void testWakeup() throws Exception {
try (FetchBuffer fetchBuffer = new FetchBuffer(logContext)) {
final Thread waitingThread = new Thread(() -> {
final Timer timer = time.timer(Duration.ofMinutes(1));
fetchBuffer.awaitNotEmpty(timer);
});
waitingThread.start();
fetchBuffer.wakeup();
waitingThread.join(Duration.ofSeconds(30).toMillis());
assertFalse(waitingThread.isAlive());
}
}

private CompletedFetch completedFetch(TopicPartition tp) {
FetchResponseData.PartitionData partitionData = new FetchResponseData.PartitionData();
Expand Down