This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 6d67b911a7 ARTEMIS-5861 Adding test with 0 shtudownTimeout on
ClusterCleanNodeShutdownTest
6d67b911a7 is described below
commit 6d67b911a723f6fc45a372672f2f413a030487da
Author: Clebert Suconic <[email protected]>
AuthorDate: Tue Feb 3 12:08:04 2026 -0500
ARTEMIS-5861 Adding test with 0 shtudownTimeout on
ClusterCleanNodeShutdownTest
---
.../artemis/tests/util/ActiveMQTestBase.java | 4 +-
.../cluster/topology/HAClientTopologyTest.java | 2 +-
.../warnings/ClusterCleanNodeShutdownTest.java | 45 +++++++++++++++++-----
3 files changed, 39 insertions(+), 12 deletions(-)
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 58ca423847..ec04976e66 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -1191,13 +1191,13 @@ public abstract class ActiveMQTestBase extends
ArtemisTestCase {
return new TransportConfiguration(NETTY_CONNECTOR_FACTORY,
server1Params);
}
- protected static final TransportConfiguration
createTransportConfiguration(boolean netty,
+ protected TransportConfiguration createTransportConfiguration(boolean netty,
boolean acceptor,
Map<String, Object> params) {
return
createTransportConfiguration(UUIDGenerator.getInstance().generateStringUUID(),
netty, acceptor, params);
}
- protected static final TransportConfiguration
createTransportConfiguration(String name,
+ protected TransportConfiguration createTransportConfiguration(String name,
boolean netty,
boolean acceptor,
Map<String, Object> params) {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
index 21bce504a5..5349611164 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java
@@ -53,7 +53,7 @@ public class HAClientTopologyTest extends
TopologyClusterTestBase {
@Override
protected ServerLocator createHAServerLocator() {
- TransportConfiguration tc =
ActiveMQTestBase.createTransportConfiguration(isNetty(), false,
ActiveMQTestBase.generateParams(0, isNetty()));
+ TransportConfiguration tc = createTransportConfiguration(isNetty(),
false, ActiveMQTestBase.generateParams(0, isNetty()));
ServerLocator locator =
addServerLocator(ActiveMQClient.createServerLocatorWithHA(tc));
locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true);
return locator;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/warnings/ClusterCleanNodeShutdownTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/warnings/ClusterCleanNodeShutdownTest.java
index 2630c92690..b13871b074 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/warnings/ClusterCleanNodeShutdownTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/warnings/ClusterCleanNodeShutdownTest.java
@@ -17,8 +17,14 @@
package org.apache.activemq.artemis.tests.integration.cluster.warnings;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.lang.invoke.MethodHandles;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import
org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import
org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
@@ -31,8 +37,35 @@ public class ClusterCleanNodeShutdownTest extends
ClusterTestBase {
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ public long shutdownTimeout = 0;
+
+
+ @Override
+ protected final TransportConfiguration createTransportConfiguration(String
name,
+ boolean
netty,
+ boolean
acceptor,
+
Map<String, Object> params) {
+
+ assertTrue(netty);
+ TransportConfiguration transportConfiguration =
super.createTransportConfiguration(name, netty, acceptor, params);
+
+
transportConfiguration.getParams().put(TransportConstants.SHUTDOWN_TIMEOUT,
String.valueOf(shutdownTimeout));
+
+ return transportConfiguration;
+ }
+
+ @Test
+ public void
testNoWarningErrorsDuringRestartingNodesInClusterTimeoutNoTimeout() throws
Exception {
+ internalTest(0);
+ }
+
@Test
- public void testNoWarningErrorsDuringRestartingNodesInCluster() throws
Exception {
+ public void
testNoWarningErrorsDuringRestartingNodesInClusterTimeoutLargeTimeout() throws
Exception {
+ internalTest(TimeUnit.HOURS.toMillis(2));
+ }
+
+ public void internalTest(final long timeout) throws Exception {
+ shutdownTimeout = timeout;
setupServer(0, isFileStorage(), isNetty());
setupServer(1, isFileStorage(), isNetty());
@@ -40,14 +73,8 @@ public class ClusterCleanNodeShutdownTest extends
ClusterTestBase {
setupClusterConnection("cluster1", "queues",
MessageLoadBalancingType.ON_DEMAND, 1, isNetty(), 1, 0);
startServers(0, 1);
- Wait.assertTrue(() -> {
-
getServer(0).getClusterManager().getClusterController().awaitConnectionToReplicationCluster();
- return true;
- }, 2000L);
- Wait.assertTrue(() -> {
-
getServer(1).getClusterManager().getClusterController().awaitConnectionToReplicationCluster();
- return true;
- }, 2000L);
+
getServer(0).getClusterManager().getClusterController().awaitConnectionToReplicationCluster();
+
getServer(1).getClusterManager().getClusterController().awaitConnectionToReplicationCluster();
logger.debug("server 0 = {}", getServer(0).getNodeID());
logger.debug("server 1 = {}", getServer(1).getNodeID());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
