Skip to content

CAMEL-24063: Fix flaky DirectProducerBlockingTest.testProducerBlocksResumeTest #24698

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
gnodet wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −24
Open

CAMEL-24063: Fix flaky DirectProducerBlockingTest.testProducerBlocksResumeTest #24698

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8aa3d
CAMEL-24063: Fix flaky DirectProducerBlockingTest.testProducerBlocksR…
gnodet Jul 16, 2026
7c2217a
CAMEL-24063: Revert Awaitility-based DirectProducerBlockingTest to ra…
gnodet Jul 21, 2026
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
41 changes: 17 additions & 24 deletions ...amel-core/src/test/java/org/apache/camel/component/direct/DirectProducerBlockingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.camel.component.direct;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import org.apache.camel.CamelExchangeException;
Expand All @@ -28,7 +28,6 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;

import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -74,32 +73,26 @@ public void testProducerBlocksWithNoConsumers() throws Exception {

@Test
public void testProducerBlocksResumeTest() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);

context.getRouteController().suspendRoute("foo");

Thread mainThread = Thread.currentThread();
ExecutorService executor = Executors.newSingleThreadExecutor();
executor.submit(new Runnable() {
@Override
public void run() {
try {
// Wait for the main thread to enter TIMED_WAITING state
// (blocked on condition in DirectComponent.getConsumer)
await().atMost(2, TimeUnit.SECONDS)
.pollInterval(10, TimeUnit.MILLISECONDS)
.until(() -> mainThread.getState() == Thread.State.TIMED_WAITING);

log.info("Resuming consumer");
context.getRouteController().resumeRoute("foo");
} catch (Exception e) {
log.error("Error in background thread", e);
}
// Schedule route resume after 200ms. This is race-tolerant by design:
// - If resume fires before sendBody starts blocking: route is already
// resumed, sendBody finds the consumer immediately and succeeds
// - If resume fires while sendBody is blocking: sendBody gets unblocked
// Either outcome produces a passing test.
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
executor.schedule(() -> {
try {
log.info("Resuming consumer");
context.getRouteController().resumeRoute("foo");
} catch (Exception e) {
log.error("Error resuming route", e);
}
});
}, 200, TimeUnit.MILLISECONDS);

getMockEndpoint("mock:result").expectedMessageCount(1);

// This call will block until the route is resumed by the background thread
template.sendBody("direct:suspended?block=true&timeout=2000", "hello world");
template.sendBody("direct:suspended?block=true&timeout=1000", "hello world");

assertMockEndpointsSatisfied();

Expand Down