Skip to content

CAMEL-23907: Fix flaky ThreadsRejectedExecutionTest #24423

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

Draft
gnodet wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −20
Draft

CAMEL-23907: Fix flaky ThreadsRejectedExecutionTest #24423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 32 additions & 20 deletions core/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
Expand Down Expand Up @@ -119,16 +120,20 @@ public void configure() {

NotifyBuilder notify = new NotifyBuilder(context).whenDone(10).create();

getMockEndpoint("mock:result").expectedMinimumMessageCount(2);
for (int i = 0; i < 10; i++) {
template.sendBody("seda:start", "Message " + i);
}
assertMockEndpointsSatisfied();

assertTrue(notify.matchesWaitTime());
// use Awaitility to wait for all exchanges to be done and inflight to drain
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.untilAsserted(() -> assertTrue(notify.matches()));
Awaitility.await().atMost(10, TimeUnit.SECONDS)
.untilAsserted(() -> assertEquals(0, context.getInflightRepository().size()));

int inflight = context.getInflightRepository().size();
assertEquals(0, inflight);
assertTrue(getMockEndpoint("mock:result").getReceivedCounter() >= 2,
"Expected at least 2 messages at mock:result but got "
+ getMockEndpoint("mock:result")
.getReceivedCounter());
}

@Test
Expand All @@ -145,16 +150,18 @@ public void configure() {

NotifyBuilder notify = new NotifyBuilder(context).whenDone(10).create();

getMockEndpoint("mock:result").expectedMessageCount(10);
for (int i = 0; i < 10; i++) {
template.sendBody("seda:start", "Message " + i);
}
assertMockEndpointsSatisfied();

assertTrue(notify.matchesWaitTime());
// use Awaitility to wait for all exchanges to be done and inflight to drain
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.untilAsserted(() -> assertTrue(notify.matches()));
Awaitility.await().atMost(10, TimeUnit.SECONDS)
.untilAsserted(() -> assertEquals(0, context.getInflightRepository().size()));

int inflight = context.getInflightRepository().size();
assertEquals(0, inflight);
// CallerRuns policy means all messages should eventually complete
assertEquals(10, getMockEndpoint("mock:result").getReceivedCounter());
}

@Test
Expand All @@ -173,20 +180,25 @@ public void configure() {

NotifyBuilder notify = new NotifyBuilder(context).whenDone(10).create();

// there should be error handling for aborted tasks (eg no redeliveries
// and no error handling)
getMockEndpoint("mock:error").expectedMessageCount(0);

getMockEndpoint("mock:result").expectedMinimumMessageCount(2);
for (int i = 0; i < 10; i++) {
template.sendBody("seda:start", "Message " + i);
}
assertMockEndpointsSatisfied();

assertTrue(notify.matchesWaitTime());

int inflight = context.getInflightRepository().size();
assertEquals(0, inflight);
// use Awaitility to wait for all exchanges to be done and inflight to drain
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.untilAsserted(() -> assertTrue(notify.matches()));
Awaitility.await().atMost(10, TimeUnit.SECONDS)
.untilAsserted(() -> assertEquals(0, context.getInflightRepository().size()));

// at least 2 messages should have made it through the thread pool
assertTrue(getMockEndpoint("mock:result").getReceivedCounter() >= 2,
"Expected at least 2 messages at mock:result but got "
+ getMockEndpoint("mock:result")
.getReceivedCounter());

// there should be no error handling for aborted tasks (no redeliveries and no error handling)
assertEquals(0, getMockEndpoint("mock:error").getReceivedCounter(),
"Expected 0 messages at mock:error but got " + getMockEndpoint("mock:error").getReceivedCounter());
}

}