Skip to content

4.x: Stabilize JMS AckMpTest redelivery test #11327

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
danielkec wants to merge 1 commit into
base: helidon-4.x
Choose a base branch
from
+101 −47
Open

4.x: Stabilize JMS AckMpTest redelivery test #11327

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
148 changes: 101 additions & 47 deletions tests/integration/jms/src/test/java/io/helidon/messaging/connectors/jms/AckMpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2025 Oracle and/or its affiliates.
* Copyright (c) 2020, 2026 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,14 +16,16 @@

package io.helidon.messaging.connectors.jms;

import java.lang.annotation.Annotation;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import io.helidon.messaging.connectors.mock.MockConnector;
import io.helidon.messaging.connectors.mock.TestConnector;
import io.helidon.microprofile.config.ConfigCdiExtension;
import io.helidon.microprofile.messaging.MessagingCdiExtension;
import io.helidon.microprofile.testing.AddBean;
Expand All @@ -35,24 +37,24 @@
import io.helidon.microprofile.testing.DisableDiscovery;
import io.helidon.microprofile.testing.junit5.HelidonTest;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.se.SeContainer;
import jakarta.jms.JMSException;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;

import static java.lang.System.Logger.Level.DEBUG;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;

@HelidonTest(resetPerTest = true)
@HelidonTest
@DisableDiscovery
@AddBeans({
@AddBean(JmsConnector.class),
@AddBean(MockConnector.class),
@AddBean(AckMpTest.ChannelAck.class),
})
@AddExtensions({
@AddExtension(ConfigCdiExtension.class),
Expand All @@ -70,58 +72,110 @@
@AddConfig(key = "mp.messaging.incoming.test-channel-ack-1.acknowledge-mode", value = "CLIENT_ACKNOWLEDGE"),
@AddConfig(key = "mp.messaging.incoming.test-channel-ack-1.type", value = "queue"),
@AddConfig(key = "mp.messaging.incoming.test-channel-ack-1.destination", value = AckMpTest.TEST_QUEUE_ACK),

@AddConfig(key = "mp.messaging.outgoing.mock-conn-channel.connector", value = MockConnector.CONNECTOR_NAME),
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class AckMpTest extends AbstractMPTest {

static final String TEST_QUEUE_ACK = "queue-ack";
static final Duration TIMEOUT = Duration.ofSeconds(15);

private static final System.Logger LOGGER = System.getLogger(AckMpTest.class.getName());
private static final Annotation TEST_CONNECTOR_ANNOTATION = MockConnector.class.getAnnotation(TestConnector.class);

@Incoming("test-channel-ack-1")
@Outgoing("mock-conn-channel")
@Acknowledgment(Acknowledgment.Strategy.MANUAL)
public CompletionStage<Message<String>> channelAck(Message<String> msg) {
LOGGER.log(DEBUG, () -> String.format("Received %s", msg.getPayload()));
if (msg.getPayload().startsWith("NO_ACK")) {
LOGGER.log(DEBUG, () -> String.format("NOT Acked %s", msg.getPayload()));
return CompletableFuture.completedStage(msg);
} else {
LOGGER.log(DEBUG, () -> String.format("Acked %s", msg.getPayload()));
return msg.ack().thenApply(unused -> {
LOGGER.log(DEBUG, () -> String.format("Ack of %s confirmed", msg.getPayload()));
return msg;
});
}
}

@Test
@Order(1)
void resendAckTestPart1(SeContainer cdi) {
MockConnector mockConnector = cdi.select(MockConnector.class, TEST_CONNECTOR_ANNOTATION).get();
void resendAckTest(SeContainer cdi) {
ChannelAck channelAck = cdi.select(ChannelAck.class).get();
//Messages starting with NO_ACK are not acked by ChannelAck bean
List<String> testData = List.of("0", "1", "2", "NO_ACK-1", "NO_ACK-2", "NO_ACK-3");
produce(TEST_QUEUE_ACK, testData, m -> {});
mockConnector.outgoing("mock-conn-channel", String.class)
.awaitPayloads(TIMEOUT, testData.toArray(String[]::new));
}

@Test
@Order(2)
void resendAckTestPart2(SeContainer cdi) {
MockConnector mockConnector = cdi.select(MockConnector.class, TEST_CONNECTOR_ANNOTATION).get();

//Check if not acked messages are redelivered
mockConnector.outgoing("mock-conn-channel", String.class)
.awaitPayloads(TIMEOUT, "NO_ACK-1", "NO_ACK-2", "NO_ACK-3");
assertThat("Not all initial items delivered in time.", channelAck.awaitDelivered(), is(true));
assertThat(channelAck.delivered(), contains(testData.toArray(String[]::new)));
assertThat("Not all redelivered items delivered in time.", channelAck.awaitRedelivered(), is(true));
assertThat(channelAck.redelivered(), contains("NO_ACK-1", "NO_ACK-2", "NO_ACK-3"));
}

@AfterAll
static void afterAll() {
AbstractJmsTest.clearQueue(TEST_QUEUE_ACK);
}

@ApplicationScoped
public static class ChannelAck {
private final List<String> delivered = Collections.synchronizedList(new ArrayList<>());
private final List<String> redelivered = Collections.synchronizedList(new ArrayList<>());
private final CountDownLatch deliveredLatch = new CountDownLatch(6);
private final CountDownLatch redeliveredLatch = new CountDownLatch(3);
private final CountDownLatch ackedLatch = new CountDownLatch(3);
private final AtomicBoolean recovered = new AtomicBoolean();

@Incoming("test-channel-ack-1")
@Acknowledgment(Acknowledgment.Strategy.MANUAL)
public CompletionStage<Void> channelAck(JmsMessage<String> msg) {
String payload = msg.getPayload();
try {
if (msg.getJmsMessage().getJMSRedelivered()) {
LOGGER.log(DEBUG, () -> String.format("Acking redelivered %s", payload));
return msg.ack().thenCompose(unused -> {
redelivered.add(payload);
redeliveredLatch.countDown();
return CompletableFuture.completedFuture(null);
});
}

LOGGER.log(DEBUG, () -> String.format("Received %s", payload));
delivered.add(payload);
if (payload.startsWith("NO_ACK")) {
LOGGER.log(DEBUG, () -> String.format("NOT Acked %s", payload));
deliveredLatch.countDown();
return maybeRecover(msg);
} else {
LOGGER.log(DEBUG, () -> String.format("Acking %s", payload));
deliveredLatch.countDown();
return msg.ack().thenCompose(unused -> {
ackedLatch.countDown();
return maybeRecover(msg);
});
}
} catch (JMSException e) {
return CompletableFuture.failedFuture(e);
}
}

boolean awaitDelivered() {
return await(deliveredLatch);
}

boolean awaitRedelivered() {
return await(redeliveredLatch);
}

List<String> delivered() {
return delivered;
}

List<String> redelivered() {
return redelivered;
}

private CompletionStage<Void> maybeRecover(JmsMessage<String> msg) {
if (deliveredLatch.getCount() == 0
&& ackedLatch.getCount() == 0
&& recovered.compareAndSet(false, true)) {
try {
LOGGER.log(DEBUG, "Recovering JMS session for unacked messages");
msg.getJmsSession().recover();
} catch (JMSException e) {
return CompletableFuture.failedFuture(e);
}
}
return CompletableFuture.completedFuture(null);
}

private boolean await(CountDownLatch latch) {
try {
return latch.await(TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return false;
}
}
}
}
Loading