This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4ed8b43641b CAMEL-19684: fixed non-deterministic concurrent test
behavior in camel-jetty (#11030)
4ed8b43641b is described below
commit 4ed8b43641bee6924d0128c5c638ec4b2db10711
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Aug 7 16:09:13 2023 +0200
CAMEL-19684: fixed non-deterministic concurrent test behavior in
camel-jetty (#11030)
Replace fixed time-based waits with latches and Awaitility calls for more
deterministic behavior
---
.../jetty/JettySuspendWhileInProgressTest.java | 50 +++++++++++++---------
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java
index e445a7ca66d..b9290b6e56d 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jetty;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -23,39 +25,34 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class JettySuspendWhileInProgressTest extends BaseJettyTest {
+ private static final Logger LOG =
LoggerFactory.getLogger(JettySuspendWhileInProgressTest.class);
private String serverUri = "http://localhost:"; + getPort() + "/cool";
+ private CountDownLatch latch = new CountDownLatch(1);
@Test
public void testJettySuspendWhileInProgress() throws Exception {
context.getShutdownStrategy().setTimeout(50);
- // send a request/reply and have future handle so we can shutdown while
+ // send a request/reply and have a future handle, so we can shut down
while
// in progress
Future<String> reply = template.asyncRequestBodyAndHeader(serverUri,
null, "name", "Camel", String.class);
- // shutdown camel while in progress, wait 2 sec so the first req has
- // been received in Camel route
- Executors.newSingleThreadExecutor().execute(new Runnable() {
- public void run() {
- try {
- Thread.sleep(2000);
- context.stop();
- } catch (Exception e) {
- // ignore
- }
- }
- });
+ // shutdown camel while in progress
+ Executors.newSingleThreadExecutor().execute(this::triggerShutdown);
// wait a bit more before sending next
- Thread.sleep(5000);
+ Awaitility.await().atMost(5,
TimeUnit.SECONDS).until(context::isStopping);
// now send a new req/reply
Future<String> reply2 = template.asyncRequestBodyAndHeader(serverUri,
null, "name", "Tiger", String.class);
@@ -64,13 +61,22 @@ public class JettySuspendWhileInProgressTest extends
BaseJettyTest {
assertEquals("Bye Camel", reply.get(20, TimeUnit.SECONDS));
// the 2nd should have a 503 returned as we are shutting down
+ Exception ex = assertThrows(ExecutionException.class, () ->
reply2.get(20, TimeUnit.SECONDS),
+ "Should have thrown an exception");
+ RuntimeCamelException rce =
assertIsInstanceOf(RuntimeCamelException.class, ex.getCause());
+ HttpOperationFailedException hofe =
assertIsInstanceOf(HttpOperationFailedException.class, rce.getCause());
+ assertEquals(503, hofe.getStatusCode(), "The 2nd status code should
have been a 503 as we are shutting down");
+ }
+
+ private void triggerShutdown() {
try {
- reply2.get(20, TimeUnit.SECONDS);
- fail("Should throw exception");
+ // wait for 2 seconds until the first req has been received in
Camel route, and then triggers the shutdown
+ if (!latch.await(2, TimeUnit.SECONDS)) {
+ LOG.warn("Timed out waiting for the latch. Shutting down
anyway ...");
+ }
+ context.stop();
} catch (Exception e) {
- RuntimeCamelException rce =
assertIsInstanceOf(RuntimeCamelException.class, e.getCause());
- HttpOperationFailedException hofe =
assertIsInstanceOf(HttpOperationFailedException.class, rce.getCause());
- assertEquals(503, hofe.getStatusCode());
+ LOG.warn("Error reported while shutting down: {}", e.getMessage(),
e);
}
}
@@ -78,7 +84,9 @@ public class JettySuspendWhileInProgressTest extends
BaseJettyTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("jetty://" + serverUri).log("Got data will wait 10 sec
with reply").delay(10000)
+ from("jetty://" + serverUri).log("Got data will wait 10 sec
with reply")
+ .process(e -> latch.countDown())
+ .delay(10000)
.transform(simple("Bye ${header.name}"));
}
};
