You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@artemis.apache.org by jb...@apache.org on 2026/08/17 12:42:29 UTC

(artemis) 04/04: ARTEMIS-6189 fix flaky MQTT tests

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git

commit 217da479688934b9e9b0c5e2e82016fd259eee26
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Aug 12 14:38:35 2026 -0500

    ARTEMIS-6189 fix flaky MQTT tests
    
    During repeated execution of MQTT tests I fixed these flaky tests:
    
    - Add a notification listener to the cluster remote subscribe test to
      synchronize on SESSION_CREATED, preventing a race in subscription
      takeover
    - Fix non-deterministic message ordering in testAutoDeleteRetainedQueue
      by consuming the retained message before publishing non-retained
      messages
    - Use Wait.assertFalse for async disconnect detection instead of an
      immediate assertion
    
    Co-Authored-By: Claude <no...@anthropic.com>
---
 .../core/server/impl/ActiveMQServerImpl.java       |  2 +-
 .../server/impl/ActiveMQServerStartupTest.java     | 21 ++++++++----
 .../artemis/tests/integration/mqtt/MQTTTest.java   | 29 ++++++++--------
 .../mqtt/MqttClusterRemoteSubscribeTest.java       | 39 +++++++++++++++++++---
 .../artemis/tests/integration/mqtt5/MQTT5Test.java |  8 +++--
 5 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 049028ee8f..31719a0f3f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -392,7 +392,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
    private final ActiveMQServer parentServer;
 
-   private CriticalAnalyzer analyzer;
+   private volatile CriticalAnalyzer analyzer;
 
    // This is a callback to be called right before an activation is created
    private Runnable afterActivationCreated;
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerStartupTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerStartupTest.java
index c77642c406..4bd4225337 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerStartupTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerStartupTest.java
@@ -28,23 +28,26 @@ import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerAccessor;
 import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
 import org.apache.activemq.artemis.utils.critical.CriticalComponentImpl;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 
 public class ActiveMQServerStartupTest extends ServerTestBase {
 
    @Test
+   @Timeout(10)
    public void testTooLongToStartHalt() throws Exception {
       testTooLongToStart(CriticalAnalyzerPolicy.HALT);
    }
 
    @Test
+   @Timeout(10)
    public void testTooLongToStartShutdown() throws Exception {
       testTooLongToStart(CriticalAnalyzerPolicy.SHUTDOWN);
    }
 
    @Test
+   @Timeout(10)
    public void testTooLongToStartLOG() throws Exception {
       testTooLongToStart(CriticalAnalyzerPolicy.LOG);
    }
@@ -70,18 +73,22 @@ public class ActiveMQServerStartupTest extends ServerTestBase {
                }
             }
          });
-         CompletableFuture.runAsync(() -> {
+         Thread startThread = new Thread(() -> {
             try {
                server.start();
             } catch (Exception e) {
                e.printStackTrace();
             }
          });
-         Wait.waitFor(() -> server.getCriticalAnalyzer() != null);
-         CriticalAnalyzerAccessor.fireActions(server.getCriticalAnalyzer(), new CriticalComponentImpl(server.getCriticalAnalyzer(), 2));
-         assertTrue(loggerHandler.findText("AMQ224116"));
-         assertFalse(server.isActive()); // should not be changed
-         latch.countDown();
+         startThread.start();
+         try {
+            assertTrue(Wait.waitFor(() -> server.getCriticalAnalyzer() != null));
+            CriticalAnalyzerAccessor.fireActions(server.getCriticalAnalyzer(), new CriticalComponentImpl(server.getCriticalAnalyzer(), 2));
+            assertTrue(loggerHandler.findText("AMQ224116"));
+            assertFalse(server.isActive()); // should not be changed
+         } finally {
+            latch.countDown();
+         }
          server.stop();
       }
    }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
index 58b4c4ac18..ecc773282b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
@@ -2239,6 +2239,7 @@ public class MQTTTest extends MQTTTestSupport {
    @Test
    @Timeout(60)
    public void testAutoDeleteRetainedQueue() throws Exception {
+      final int MESSAGE_COUNT = 3;
       final String TOPIC = "/abc/123";
       final String RETAINED_QUEUE = MQTTUtil.getCoreRetainAddressFromMqttTopic(TOPIC, server.getConfiguration().getWildcardConfiguration());
       final MQTTClientProvider publisher = getMQTTClientProvider();
@@ -2252,22 +2253,22 @@ public class MQTTTest extends MQTTTestSupport {
       String RETAINED = "retained";
       publisher.publish(TOPIC, RETAINED.getBytes(), AT_LEAST_ONCE, true);
 
+      subscriber.subscribe(TOPIC, AT_LEAST_ONCE);
+
+      byte[] msg = subscriber.receive(5000);
+      assertNotNull(msg);
+      assertEquals(RETAINED, new String(msg));
+
       List<String> messages = new ArrayList<>();
-      for (int i = 0; i < 10; i++) {
+      for (int i = 0; i < MESSAGE_COUNT; i++) {
          messages.add("TEST MESSAGE:" + i);
       }
 
-      subscriber.subscribe(TOPIC, AT_LEAST_ONCE);
-
-      for (int i = 0; i < 10; i++) {
+      for (int i = 0; i < MESSAGE_COUNT; i++) {
          publisher.publish(TOPIC, messages.get(i).getBytes(), AT_LEAST_ONCE);
       }
 
-      byte[] msg = subscriber.receive(5000);
-      assertNotNull(msg);
-      assertEquals(RETAINED, new String(msg));
-
-      for (int i = 0; i < 10; i++) {
+      for (int i = 0; i < MESSAGE_COUNT; i++) {
          msg = subscriber.receive(5000);
          assertNotNull(msg);
          assertEquals(messages.get(i), new String(msg));
@@ -2288,15 +2289,15 @@ public class MQTTTest extends MQTTTestSupport {
 
       subscriber.subscribe(TOPIC, AT_LEAST_ONCE);
 
-      for (int i = 0; i < 10; i++) {
-         publisher.publish(TOPIC, messages.get(i).getBytes(), AT_LEAST_ONCE);
-      }
-
       msg = subscriber.receive(5000);
       assertNotNull(msg);
       assertEquals(RETAINED, new String(msg));
 
-      for (int i = 0; i < 10; i++) {
+      for (int i = 0; i < MESSAGE_COUNT; i++) {
+         publisher.publish(TOPIC, messages.get(i).getBytes(), AT_LEAST_ONCE);
+      }
+
+      for (int i = 0; i < MESSAGE_COUNT; i++) {
          msg = subscriber.receive(5000);
          assertNotNull(msg);
          assertEquals(messages.get(i), new String(msg));
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MqttClusterRemoteSubscribeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MqttClusterRemoteSubscribeTest.java
index 267b1398b8..04f1a6ea6c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MqttClusterRemoteSubscribeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MqttClusterRemoteSubscribeTest.java
@@ -16,14 +16,21 @@
  */
 package org.apache.activemq.artemis.tests.integration.mqtt;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.artemis.api.core.QueueConfiguration;
 import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.core.management.CoreNotificationType;
+import org.apache.activemq.artemis.api.core.management.ManagementHelper;
 import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
 import org.apache.activemq.artemis.core.config.WildcardConfiguration;
 import org.apache.activemq.artemis.core.protocol.mqtt.MQTTProtocolManager;
@@ -43,6 +50,10 @@ import org.fusesource.mqtt.client.QoS;
 import org.fusesource.mqtt.client.Topic;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class MqttClusterRemoteSubscribeTest extends ClusterTestBase {
 
    @Override
@@ -248,11 +259,30 @@ public class MqttClusterRemoteSubscribeTest extends ClusterTestBase {
       final String ANYCAST_TOPIC = "anycast/test/1/some/la";
       final String subClientId = "subClientId";
       final String pubClientId = "pubClientId";
+      final String notifications = "notifications";
 
       setupServers(ANYCAST_TOPIC);
 
       startServers(0, 1);
 
+      ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocator("tcp://localhost:61617"));
+      ClientSessionFactory sf = createSessionFactory(locator);
+      ClientSession session = addClientSession(sf.createSession(false, true, true));
+      servers[1].createQueue(QueueConfiguration.of(notifications).setAddress(servers[1].getConfiguration().getManagementNotificationAddress()).setRoutingType(RoutingType.MULTICAST));
+      ClientConsumer consumer = session.createConsumer(notifications);
+      AtomicInteger notificationCount = new AtomicInteger(0);
+      consumer.setMessageHandler(new MessageHandler() {
+         @Override
+         public void onMessage(ClientMessage message) {
+            CoreNotificationType type = CoreNotificationType.valueOf(message.getSimpleStringProperty(ManagementHelper.HDR_NOTIFICATION_TYPE).toString());
+            SimpleString protocol = message.getSimpleStringProperty(ManagementHelper.HDR_PROTOCOL_NAME);
+            if (type == CoreNotificationType.SESSION_CREATED && protocol.equals(SimpleString.of("MQTT"))) {
+               notificationCount.incrementAndGet();
+            }
+         }
+      });
+      session.start();
+
       BlockingConnection subConnection1 = null;
       BlockingConnection subConnection2 = null;
       BlockingConnection pubConnection = null;
@@ -263,6 +293,7 @@ public class MqttClusterRemoteSubscribeTest extends ClusterTestBase {
          subConnection1 = retrieveMQTTConnection("tcp://localhost:61616", subClientId);
 
          Wait.assertEquals(1, locateMQTTPM(servers[0]).getStateManager().getConnectedClients()::size);
+         Wait.assertEquals(1, () -> notificationCount.get());
 
          subConnection2 = retrieveMQTTConnection("tcp://localhost:61617", subClientId);
          pubConnection = retrieveMQTTConnection("tcp://localhost:61616", pubClientId);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5Test.java
index ff104964b1..1a85c84e8b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5Test.java
@@ -728,7 +728,7 @@ public class MQTT5Test extends MQTT5TestSupport {
       Wait.assertEquals(1, () -> getSessionStates().size(), 2000, 100);
       assertNotNull(getSessionStates().get(CLIENT_ID));
 
-      assertFalse(client.isConnected());
+      Wait.assertFalse(() -> client.isConnected(), 2000, 100);
 
       client.close();
       client2.disconnect();
@@ -917,7 +917,11 @@ public class MQTT5Test extends MQTT5TestSupport {
       pendingCountCheckLatch.countDown();
 
       // disconnect subscriber
-      subscriber.disconnect();
+      try {
+         subscriber.disconnect();
+      } catch (Exception e) {
+         // ignore
+      }
       Wait.assertFalse(() -> mqttSessionState.isAttached(), 2000, 50);
       assertEquals(0, mqttSessionState.getSendQuota());
       assertEquals(1L, subscriptionQueue.getMessageCount());


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org