You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/07/28 16:13:09 UTC
[activemq-artemis] branch new-logging updated: more test changes
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/new-logging by this push:
new f96cb93bdb more test changes
f96cb93bdb is described below
commit f96cb93bdbe5d6432924dcc64554af7aa42c0bb5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 28 17:12:55 2022 +0100
more test changes
---
.../cluster/bridge/BridgeReconnectTest.java | 5 ++-
.../integration/cluster/bridge/BridgeTest.java | 15 ++++---
.../cluster/bridge/NettyBridgeReconnectTest.java | 3 --
.../distribution/AutoDeleteDistributedTest.java | 9 ++--
.../cluster/distribution/ClusterTestBase.java | 52 ++++++++++++----------
.../distribution/ClusteredGroupingTest.java | 15 ++++---
.../distribution/MessageRedistributionTest.java | 5 ++-
.../distribution/OnewayTwoNodeClusterTest.java | 9 ++--
.../distribution/SimpleSymmetricClusterTest.java | 7 +--
.../cluster/distribution/SymmetricClusterTest.java | 5 ++-
.../distribution/TwoWayTwoNodeClusterTest.java | 11 ++---
.../cluster/failover/AsynchronousFailoverTest.java | 38 +++++++---------
.../cluster/failover/BackupSyncJournalTest.java | 3 --
.../ClusterWithBackupFailoverTestBase.java | 7 +--
.../cluster/failover/FailBackAutoTest.java | 9 ++--
.../failover/FailoverOnFlowControlTest.java | 9 ++--
.../integration/cluster/failover/FailoverTest.java | 32 +++++++------
.../cluster/failover/NetworkIsolationTest.java | 5 ++-
.../PageCleanupWhileReplicaCatchupTest.java | 8 ++--
...orumNettyNoGroupNameReplicatedFailoverTest.java | 5 ++-
...leQuorumReplicatedLargeMessageFailoverTest.java | 5 ++-
.../MultiThreadRandomReattachTestBase.java | 17 +++----
.../MultiThreadReattachSupportTestBase.java | 9 ++--
.../cluster/reattach/RandomReattachTest.java | 23 +++++-----
.../tests/integration/mqtt/MQTTTestSupport.java | 2 +-
25 files changed, 160 insertions(+), 148 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
index 22776b82f7..96a9d383a3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java
@@ -63,13 +63,14 @@ import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerPlugin;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class BridgeReconnectTest extends BridgeTestBase {
@@ -84,7 +85,7 @@ public class BridgeReconnectTest extends BridgeTestBase {
@Parameterized.Parameter(0)
public boolean persistCache;
- private static final Logger log = Logger.getLogger(BridgeReconnectTest.class);
+ private static final Logger log = LoggerFactory.getLogger(BridgeReconnectTest.class);
private static final int NUM_MESSAGES = 100;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 550bcf4674..15d742639c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -83,17 +83,18 @@ import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(value = Parameterized.class)
public class BridgeTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(BridgeTest.class);
+ private static final Logger log = LoggerFactory.getLogger(BridgeTest.class);
private ActiveMQServer server0;
private ActiveMQServer server1;
@@ -1495,7 +1496,7 @@ public class BridgeTest extends ActiveMQTestBase {
msgCount.incrementAndGet();
if (i % 500 == 0)
- instanceLog.debug("received " + i);
+ instanceLog.debug("received {}", i);
}
boolean failed = false;
@@ -1813,7 +1814,7 @@ public class BridgeTest extends ActiveMQTestBase {
File outputFile = new File(getTemporaryDir(), "huge_message_received.dat");
- instanceLog.debug("-----message save to: " + outputFile.getAbsolutePath());
+ instanceLog.debug("-----message save to: {}", outputFile.getAbsolutePath());
FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
BufferedOutputStream bufferedOutput = new BufferedOutputStream(fileOutputStream);
@@ -1858,7 +1859,7 @@ public class BridgeTest extends ActiveMQTestBase {
createFile(fileInput, largeMessageSize);
- instanceLog.debug("File created at: " + fileInput.getAbsolutePath());
+ instanceLog.debug("File created at: {}", fileInput.getAbsolutePath());
ClientMessage message = session.createMessage(Message.BYTES_TYPE, true);
@@ -1872,13 +1873,13 @@ public class BridgeTest extends ActiveMQTestBase {
private static void createFile(final File file, final long fileSize) throws IOException {
if (file.exists()) {
- log.warn("---file already there " + file.length());
+ log.warn("---file already there {}", file.length());
return;
}
FileOutputStream fileOut = new FileOutputStream(file);
BufferedOutputStream buffOut = new BufferedOutputStream(fileOut);
byte[] outBuffer = new byte[1024 * 1024];
- log.debug(" --- creating file, size: " + fileSize);
+ log.debug(" --- creating file, size: {}", fileSize);
for (long i = 0; i < fileSize; i += outBuffer.length) {
buffOut.write(outBuffer);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java
index eed9483763..c79c3190e3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java
@@ -45,7 +45,6 @@ import org.apache.activemq.artemis.core.server.cluster.impl.BridgeTestAccessor;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -53,8 +52,6 @@ import org.junit.Test;
public class NettyBridgeReconnectTest extends BridgeTestBase {
- private static final Logger log = Logger.getLogger(NettyBridgeReconnectTest.class);
-
final String bridgeName = "bridge1";
final String testAddress = "testAddress";
final int confirmationWindowSize = 100 * 1024;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java
index 3b3ff392b0..2de920bde4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java
@@ -33,13 +33,14 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AutoDeleteDistributedTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(AutoDeleteDistributedTest.class);
+ private static final Logger log = LoggerFactory.getLogger(AutoDeleteDistributedTest.class);
@Override
@Before
@@ -109,7 +110,7 @@ public class AutoDeleteDistributedTest extends ClusterTestBase {
client2JmsConsumer.setMessageListener(new MessageListener() {
@Override
public void onMessage(final javax.jms.Message m) {
- log.debug("Message received. " + m);
+ log.debug("Message received. {}", m);
onMessageReceived.countDown();
}
});
@@ -124,7 +125,7 @@ public class AutoDeleteDistributedTest extends ClusterTestBase {
jmsProducer.setAsync(new javax.jms.CompletionListener() {
@Override
public void onCompletion(final javax.jms.Message m) {
- log.debug("Message sent. " + m);
+ log.debug("Message sent. {}", m);
onMessageSent.countDown();
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 6c5d176e1c..d6d5a62847 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -92,15 +92,16 @@ import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
import org.apache.activemq.artemis.quorum.file.FileBasedPrimitiveManager;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.PortCheckRule;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ClusterTestBase extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(ClusterTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(ClusterTestBase.class);
private static final int[] PORTS = {TransportConstants.DEFAULT_PORT, TransportConstants.DEFAULT_PORT + 1, TransportConstants.DEFAULT_PORT + 2, TransportConstants.DEFAULT_PORT + 3, TransportConstants.DEFAULT_PORT + 4, TransportConstants.DEFAULT_PORT + 5, TransportConstants.DEFAULT_PORT + 6, TransportConstants.DEFAULT_PORT + 7, TransportConstants.DEFAULT_PORT + 8, TransportConstants.DEFAULT_PORT + 9,};
@@ -279,7 +280,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
protected void waitForFailoverTopology(final int bNode, final int... nodes) throws Exception {
ActiveMQServer server = servers[bNode];
- log.debug("waiting for " + Arrays.toString(nodes) + " on the topology for server = " + server);
+ if (log.isDebugEnabled()) {
+ log.debug("waiting for " + Arrays.toString(nodes) + " on the topology for server = " + server);
+ }
long start = System.currentTimeMillis();
@@ -333,6 +336,10 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
}
private void logTopologyDiagram() {
+ if (!log.isDebugEnabled()) {
+ return;
+ }
+
try {
StringBuffer topologyDiagram = new StringBuffer();
for (ActiveMQServer activeMQServer : servers) {
@@ -435,7 +442,8 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
final int expectedBindingCount,
final int expectedConsumerCount,
final boolean local) throws Exception {
- log.debug("waiting for bindings on node " + node +
+ if (log.isDebugEnabled()) {
+ log.debug("waiting for bindings on node " + node +
" address " +
address +
" expectedBindingCount " +
@@ -444,6 +452,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
expectedConsumerCount +
" local " +
local);
+ }
ActiveMQServer server = servers[node];
@@ -461,13 +470,13 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
Bindings bindings = po.getBindingsForAddress(new SimpleString(address));
log.debug("=======================================================================");
- log.debug("Binding information for address = " + address + " on node " + node);
+ log.debug("Binding information for address = {} on node {}", address, node);
for (Binding binding : bindings.getBindings()) {
if (binding.isConnected() && (binding instanceof LocalQueueBinding && local || binding instanceof RemoteQueueBinding && !local)) {
QueueBinding qBinding = (QueueBinding) binding;
- log.debug("Binding = " + qBinding + ", queue=" + qBinding.getQueue());
+ log.debug("Binding = {}, queue={}", qBinding, qBinding.getQueue());
}
}
@@ -574,7 +583,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
filterString = ClusterTestBase.FILTER_PROP.toString() + "='" + filterVal + "'";
}
- log.debug("Creating " + queueName + " , address " + address + " on " + servers[node]);
+ log.debug("Creating {} , address {} on {}", queueName, address, servers[node]);
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(routingType).setFilterString(filterString).setDurable(durable));
@@ -1023,11 +1032,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
message.getObjectProperty(ClusterTestBase.COUNT_PROP);
}
outOfOrder = true;
- log.debug("Message j=" + j + " was received out of order = " +
- message.getObjectProperty(ClusterTestBase.COUNT_PROP));
- log.debug("Message j=" + j +
- " was received out of order = " +
- message.getObjectProperty(ClusterTestBase.COUNT_PROP));
+ log.debug("Message j={} was received out of order = {}", j, message.getObjectProperty(ClusterTestBase.COUNT_PROP));
}
}
}
@@ -1038,7 +1043,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
private void dumpConsumers() throws Exception {
for (int i = 0; i < consumers.length; i++) {
if (consumers[i] != null && !consumers[i].consumer.isClosed()) {
- log.debug("Dumping consumer " + i);
+ log.debug("Dumping consumer {}", i);
checkReceive(i);
}
@@ -1091,11 +1096,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
message = holder.consumer.receive(500);
if (message != null) {
- log.debug("check receive Consumer " + consumerID +
- " received message " +
- message.getObjectProperty(ClusterTestBase.COUNT_PROP));
+ log.debug("check receive Consumer {} received message {}", consumerID, message.getObjectProperty(ClusterTestBase.COUNT_PROP));
} else {
- log.debug("check receive Consumer " + consumerID + " null message");
+ log.debug("check receive Consumer {} null message", consumerID);
}
}
while (message != null);
@@ -1995,7 +1998,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
protected void startServers(final int... nodes) throws Exception {
for (int node : nodes) {
- log.debug("#test start node " + node);
+ log.debug("#test start node {}", node);
final long currentTime = System.currentTimeMillis();
boolean waitForSelf = currentTime - timeStarts[node] < TIMEOUT_START_SERVER;
boolean waitForPrevious = node > 0 && currentTime - timeStarts[node - 1] < TIMEOUT_START_SERVER;
@@ -2003,10 +2006,10 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
Thread.sleep(TIMEOUT_START_SERVER);
}
timeStarts[node] = System.currentTimeMillis();
- log.debug("starting server " + servers[node]);
+ log.debug("starting server {}", servers[node]);
servers[node].start();
- log.debug("started server " + servers[node]);
+ log.debug("started server {}", servers[node]);
waitForServerToStart(servers[node]);
if (servers[node].getStorageManager() != null && isForceUniqueStorageManagerIds()) {
@@ -2031,7 +2034,10 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
}
protected void stopServers(final int... nodes) throws Exception {
- log.debug("Stopping nodes " + Arrays.toString(nodes));
+ if (log.isDebugEnabled()) {
+ log.debug("Stopping nodes " + Arrays.toString(nodes));
+ }
+
Exception exception = null;
for (int node : nodes) {
if (servers[node] != null && servers[node].isStarted()) {
@@ -2043,9 +2049,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
timeStarts[node] = System.currentTimeMillis();
- log.debug("stopping server " + node);
+ log.debug("stopping server {}", node);
servers[node].stop();
- log.debug("server " + node + " stopped");
+ log.debug("server {} stopped", node);
} catch (Exception e) {
exception = e;
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
index a384507bc0..c025b2dd05 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
@@ -50,13 +50,14 @@ import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.RetryRule;
-import org.jboss.logging.Logger;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ClusteredGroupingTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(ClusteredGroupingTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ClusteredGroupingTest.class);
@Rule
public RetryRule retryRule = new RetryRule(2);
@@ -597,12 +598,12 @@ public class ClusteredGroupingTest extends ClusterTestBase {
groups.add(group);
}
producer.send(message);
- log.trace("Sent message to server 1 with dupID: " + dupID);
+ log.trace("Sent message to server 1 with dupID: {}", dupID);
}
session.commit();
totalMessageProduced.addAndGet(500);
- log.trace("Sent block of 500 messages to server 1. Total sent: " + totalMessageProduced.get());
+ log.trace("Sent block of 500 messages to server 1. Total sent: {}", totalMessageProduced.get());
session.close();
// need thread pool to service both consumers and producers plus a thread to cycle nodes
@@ -642,7 +643,7 @@ public class ClusteredGroupingTest extends ClusterTestBase {
} else {
factory = sf0;
}
- log.debug("Creating producer session factory to node " + targetServer);
+ log.debug("Creating producer session factory to node {}", targetServer);
session = addClientSession(factory.createSession(false, true, true));
producer = addClientProducer(session.createProducer(ADDRESS));
} catch (Exception e) {
@@ -732,7 +733,7 @@ public class ClusteredGroupingTest extends ClusterTestBase {
} else {
factory = sf0;
}
- log.debug("Creating consumer session factory to node " + targetServer);
+ log.debug("Creating consumer session factory to node {}", targetServer);
session = addClientSession(factory.createSession(false, false, true));
consumer = addClientConsumer(session.createConsumer(QUEUE));
session.start();
@@ -752,7 +753,7 @@ public class ClusteredGroupingTest extends ClusterTestBase {
return;
}
m.acknowledge();
- log.trace("Consumed message " + m.getStringProperty(Message.HDR_DUPLICATE_DETECTION_ID) + " from server " + targetServer + ". Total consumed: " + totalMessagesConsumed.incrementAndGet());
+ log.trace("Consumed message {} from server {}. Total consumed: {}", m.getStringProperty(Message.HDR_DUPLICATE_DETECTION_ID), targetServer, totalMessagesConsumed.incrementAndGet());
} catch (ActiveMQException e) {
errors.incrementAndGet();
log.warn("Consumer thread threw exception while receiving messages from server " + targetServer + ".: " + e.getMessage());
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
index 54d3ab8367..9765cbc080 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
@@ -41,14 +41,15 @@ import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageRedistributionTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(MessageRedistributionTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MessageRedistributionTest.class);
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
index d3247d3eca..e1b7e7da65 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
@@ -18,14 +18,15 @@ package org.apache.activemq.artemis.tests.integration.cluster.distribution;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class OnewayTwoNodeClusterTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(OnewayTwoNodeClusterTest.class);
+ private static final Logger log = LoggerFactory.getLogger(OnewayTwoNodeClusterTest.class);
@Override
@Before
@@ -149,13 +150,13 @@ public class OnewayTwoNodeClusterTest extends ClusterTestBase {
waitForTopology(servers[0], 1);
- OnewayTwoNodeClusterTest.log.debug("restarting server 1(" + servers[1].getIdentity() + ")");
+ OnewayTwoNodeClusterTest.log.debug("restarting server 1({})", servers[1].getIdentity());
startServers(1);
waitForTopology(servers[0], 2);
- log.debug("Server 1 id=" + servers[1].getNodeID());
+ log.debug("Server 1 id={}", servers[1].getNodeID());
long end = System.currentTimeMillis();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index 0fbe1ab479..6fabc652c3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -28,14 +28,15 @@ import org.apache.activemq.artemis.core.server.cluster.RemoteQueueBinding;
import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SimpleSymmetricClusterTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(SimpleSymmetricClusterTest.class);
+ private static final Logger log = LoggerFactory.getLogger(SimpleSymmetricClusterTest.class);
@@ -282,7 +283,7 @@ public class SimpleSymmetricClusterTest extends ClusterTestBase {
public void _testLoop() throws Throwable {
for (int i = 0; i < 10; i++) {
loopNumber = i;
- log.debug("#test " + i);
+ log.debug("#test {}", i);
testSimple();
tearDown();
setUp();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
index 7f84cab533..4b288d8e46 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
@@ -22,9 +22,10 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A SymmetricClusterTest
@@ -33,7 +34,7 @@ import org.junit.Test;
*/
public class SymmetricClusterTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(SymmetricClusterTest.class);
+ private static final Logger log = LoggerFactory.getLogger(SymmetricClusterTest.class);
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
index a84738b11e..8a6c3ce081 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
@@ -26,15 +26,16 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Map;
public class TwoWayTwoNodeClusterTest extends ClusterTestBase {
- private static final Logger log = Logger.getLogger(TwoWayTwoNodeClusterTest.class);
+ private static final Logger log = LoggerFactory.getLogger(TwoWayTwoNodeClusterTest.class);
@Override
@Before
@@ -235,13 +236,13 @@ public class TwoWayTwoNodeClusterTest extends ClusterTestBase {
waitForTopology(servers[1], 2);
for (int i = 0; i < 10; i++) {
- log.debug("Sleep #test " + i);
- log.debug("#stop #test #" + i);
+ log.debug("Sleep #test {}", i);
+ log.debug("#stop #test #{}", i);
Thread.sleep(500);
stopServers(1);
waitForTopology(servers[0], 1, -1, 2000);
- log.debug("#start #test #" + i);
+ log.debug("#start #test #{}", i);
startServers(1);
waitForTopology(servers[0], 2, -1, 2000);
waitForTopology(servers[1], 2, -1, 2000);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index ebfbdae3aa..d477136c2a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -41,9 +41,10 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A MultiThreadFailoverTest
@@ -52,7 +53,7 @@ import org.junit.Test;
*/
public class AsynchronousFailoverTest extends FailoverTestBase {
- private static final Logger log = Logger.getLogger(AsynchronousFailoverTest.class);
+ private static final Logger log = LoggerFactory.getLogger(AsynchronousFailoverTest.class);
private volatile CountDownSessionFailureListener listener;
@@ -139,7 +140,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
try {
for (int i = 0; i < numIts; i++) {
- log.debug("Iteration " + i);
+ log.debug("Iteration {}", i);
//set block timeout to 10 sec to reduce test time.
ServerLocator locator = getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(30).setRetryInterval(100).setConfirmationWindowSize(10 * 1024 * 1024).setCallTimeout(10000).setCallFailoverTimeout(10000);
@@ -160,7 +161,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
long randomDelay = (long) (2000 * Math.random());
- log.debug("Sleeping " + randomDelay);
+ log.debug("Sleeping {}", randomDelay);
Thread.sleep(randomDelay);
@@ -168,9 +169,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
// Simulate failure on connection
synchronized (lockFail) {
- if (log.isDebugEnabled()) {
- log.debug("#test crashing test");
- }
+ log.debug("#test crashing test");
crash(createSession);
}
@@ -249,7 +248,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
retry = false;
} catch (ActiveMQUnBlockedException ube) {
- log.debug("exception when sending message with counter " + i);
+ log.debug("exception when sending message with counter {}", i);
ube.printStackTrace();
@@ -302,7 +301,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
Assert.fail("got another counter gap at " + count + ": " + counts);
} else {
if (lastCount != -1) {
- log.debug("got first counter gap at " + count);
+ log.debug("got first counter gap at {}", count);
counterGap = true;
}
}
@@ -328,7 +327,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
executionId++;
- log.debug("#test doTestTransactional starting now. Execution " + executionId);
+ log.debug("#test doTestTransactional starting now. Execution {}", executionId);
try {
@@ -375,9 +374,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
addPayload(message);
- if (log.isDebugEnabled()) {
- log.debug("Sending message " + message);
- }
+ log.debug("Sending message {}", message);
producer.send(message);
}
@@ -448,22 +445,19 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
session.start();
for (int i = 0; i < numMessages; i++) {
- if (log.isDebugEnabled()) {
- log.debug("Consumer receiving message " + i);
- }
+ log.debug("Consumer receiving message {}", i);
+
ClientMessage message = consumer.receive(60000);
if (message == null) {
break;
}
- if (log.isDebugEnabled()) {
- log.debug("Received message " + message);
- }
+ log.debug("Received message {}", message);
int count = message.getIntProperty("counter");
if (count != i) {
- log.warn("count was received out of order, " + count + "!=" + i);
+ log.warn("count was received out of order, {}!={}", count, i);
}
msgs.add(count);
@@ -492,7 +486,9 @@ public class AsynchronousFailoverTest extends FailoverTestBase {
assertTrue("msgs.size is expected to be " + numMessages + " but it was " + msgs.size(), msgs.size() == numMessages);
}
} catch (Throwable e) {
- log.debug(threadDump("Thread dump, messagesReceived = " + msgs.size()));
+ if (log.isDebugEnabled()) {
+ log.debug(threadDump("Thread dump, messagesReceived = " + msgs.size()));
+ }
logAndSystemOut(e.getMessage() + " messages received");
for (Integer msg : msgs) {
logAndSystemOut(msg.toString());
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
index ef675cb4c7..30986fa890 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
@@ -52,15 +52,12 @@ import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.UUID;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class BackupSyncJournalTest extends FailoverTestBase {
- private static final Logger logger = Logger.getLogger(BackupSyncJournalTest.class);
-
protected static final int BACKUP_WAIT_TIME = 60;
private ServerLocatorInternal locator;
protected ClientSessionFactoryInternal sessionFactory;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
index a87d6b033d..b265b72840 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
@@ -24,15 +24,16 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer;
import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
-import org.jboss.logging.Logger;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ClusterWithBackupFailoverTestBase extends ClusterTestBase {
protected static final String QUEUE_NAME = "queue0";
protected static final String QUEUES_TESTADDRESS = "queues.testaddress";
- protected static final Logger log = Logger.getLogger(ClusterWithBackupFailoverTestBase.class);
+ protected static final Logger log = LoggerFactory.getLogger(ClusterWithBackupFailoverTestBase.class);
protected abstract void setupCluster(MessageLoadBalancingType messageLoadBalancingType) throws Exception;
@@ -73,7 +74,7 @@ public abstract class ClusterWithBackupFailoverTestBase extends ClusterTestBase
* @throws Exception
*/
protected void failNode(final int node, final int originalLiveNode) throws Exception {
- log.debug("*** failing node " + node);
+ log.debug("*** failing node {}", node);
ActiveMQServer server = getServer(node);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
index b3103414a6..d093f5757d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java
@@ -37,13 +37,14 @@ import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FailBackAutoTest extends FailoverTestBase {
- private static final Logger log = Logger.getLogger(FailBackAutoTest.class);
+ private static final Logger log = LoggerFactory.getLogger(FailBackAutoTest.class);
private static final int NUM_MESSAGES = 100;
private ServerLocatorInternal locator;
@@ -72,7 +73,7 @@ public class FailBackAutoTest extends FailoverTestBase {
assertTrue(latch.await(5, TimeUnit.SECONDS));
- log.debug("backup (nowLive) topology = " + backupServer.getServer().getClusterManager().getDefaultConnection(null).getTopology().describe());
+ log.debug("backup (nowLive) topology = {}", backupServer.getServer().getClusterManager().getDefaultConnection(null).getTopology().describe());
log.debug("Server Crash!!!");
@@ -99,7 +100,7 @@ public class FailBackAutoTest extends FailoverTestBase {
Thread.sleep(1000);
- log.debug("After failback: " + locator.getTopology().describe());
+ log.debug("After failback: {}", locator.getTopology().describe());
assertTrue(latch2.await(5, TimeUnit.SECONDS));
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
index 3d39e09f50..bd5b38e86c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
@@ -34,12 +34,13 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionPro
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnection;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FailoverOnFlowControlTest extends FailoverTestBase {
- private static final Logger log = Logger.getLogger(FailoverOnFlowControlTest.class);
+ private static final Logger log = LoggerFactory.getLogger(FailoverOnFlowControlTest.class);
@Test
public void testOverflowSend() throws Exception {
ServerLocator locator = getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(300).setProducerWindowSize(1000).setRetryInterval(100);
@@ -49,12 +50,12 @@ public class FailoverOnFlowControlTest extends FailoverTestBase {
@Override
public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException {
- log.debug("Intercept..." + packet.getClass().getName());
+ log.debug("Intercept...{}", packet.getClass().getName());
if (packet instanceof SessionProducerCreditsMessage) {
SessionProducerCreditsMessage credit = (SessionProducerCreditsMessage) packet;
- log.debug("Credits: " + credit.getCredits());
+ log.debug("Credits: {}", credit.getCredits());
if (count.incrementAndGet() == 2) {
log.debug("### crashing server");
try {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 436f4ac2a5..8f0bb16ea0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -84,16 +84,17 @@ import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.RetryRule;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FailoverTest extends FailoverTestBase {
- private static final Logger log = Logger.getLogger(FailoverTest.class);
+ private static final Logger log = LoggerFactory.getLogger(FailoverTest.class);
@Rule
public RetryRule retryRule = new RetryRule(2);
@@ -239,8 +240,7 @@ public class FailoverTest extends FailoverTestBase {
Integer counter = message.getIntProperty("counter");
received.put(counter, message);
try {
- log.debug("acking message = id = " + message.getMessageID() + ", counter = " +
- message.getIntProperty("counter"));
+ log.debug("acking message = id = {}, counter = {}", message.getMessageID(), message.getIntProperty("counter"));
message.acknowledge();
session.commit();
} catch (ActiveMQException e) {
@@ -252,7 +252,7 @@ public class FailoverTest extends FailoverTestBase {
e.printStackTrace();
return;
}
- log.debug("Acked counter = " + counter);
+ log.debug("Acked counter = {}", counter);
if (counter.equals(10)) {
latch.countDown();
}
@@ -310,15 +310,13 @@ public class FailoverTest extends FailoverTestBase {
Integer counter = message.getIntProperty("counter");
received.put(counter, message);
try {
- log.debug("acking message = id = " + message.getMessageID() +
- ", counter = " +
- message.getIntProperty("counter"));
+ log.debug("acking message = id = {}, counter = {}", message.getMessageID(), message.getIntProperty("counter"));
message.acknowledge();
} catch (ActiveMQException e) {
e.printStackTrace();
continue;
}
- log.debug("Acked counter = " + counter);
+ log.debug("Acked counter = {}", counter);
if (counter.equals(10)) {
latch.countDown();
}
@@ -700,14 +698,14 @@ public class FailoverTest extends FailoverTestBase {
TransportConfiguration initialLive = getFieldFromSF(sf, "currentConnectorConfig");
TransportConfiguration initialBackup = getFieldFromSF(sf, "backupConnectorConfig");
- instanceLog.debug("initlive: " + initialLive);
- instanceLog.debug("initback: " + initialBackup);
+ instanceLog.debug("initlive: {}", initialLive);
+ instanceLog.debug("initback: {}", initialBackup);
TransportConfiguration last = getFieldFromSF(sf, "connectorConfig");
TransportConfiguration current = getFieldFromSF(sf, "currentConnectorConfig");
- instanceLog.debug("now last: " + last);
- instanceLog.debug("now current: " + current);
+ instanceLog.debug("now last: {}", last);
+ instanceLog.debug("now current: {}", current);
assertTrue(current.equals(initialLive));
ClientSession session = createSession(sf, true, true);
@@ -723,8 +721,8 @@ public class FailoverTest extends FailoverTestBase {
last = getFieldFromSF(sf, "connectorConfig");
current = getFieldFromSF(sf, "currentConnectorConfig");
- instanceLog.debug("now after live crashed last: " + last);
- instanceLog.debug("now current: " + current);
+ instanceLog.debug("now after live crashed last: {}", last);
+ instanceLog.debug("now current: {}", current);
assertTrue(current.equals(initialBackup));
@@ -744,8 +742,8 @@ public class FailoverTest extends FailoverTestBase {
last = getFieldFromSF(sf, "connectorConfig");
current = getFieldFromSF(sf, "currentConnectorConfig");
- instanceLog.debug("now after live back again last: " + last);
- instanceLog.debug("now current: " + current);
+ instanceLog.debug("now after live back again last: {}", last);
+ instanceLog.debug("now current: {}", current);
//cannot use equals here because the config's name (uuid) changes
//after failover
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NetworkIsolationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NetworkIsolationTest.java
index 3f8aabf840..0718d1e677 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NetworkIsolationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NetworkIsolationTest.java
@@ -28,14 +28,15 @@ import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NetworkIsolationTest extends FailoverTestBase {
- private static final Logger logger = Logger.getLogger(NetworkIsolationTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(NetworkIsolationTest.class);
// This address is guaranteed to fail... reserved for documentation https://tools.ietf.org/html/rfc5737
private static final String badAddress = "203.0.113.1";
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
index fa0e1a3442..b23d1d989b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PageCleanupWhileReplicaCatchupTest.java
@@ -37,18 +37,18 @@ import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PageCleanupWhileReplicaCatchupTest extends FailoverTestBase {
- private static final int PACE_TIME = 500; // Wait in millisecond for each worker
private static final int NUMBER_OF_WORKERS = 5;
private static final int NUMBER_OF_RESTARTS = 5;
- private static final Logger logger = Logger.getLogger(PageCleanupWhileReplicaCatchupTest.class);
+ private static final Logger logger = Logger.getFactoryLogger(PageCleanupWhileReplicaCatchupTest.class);
volatile boolean running = true;
@Override
@@ -97,7 +97,7 @@ public class PageCleanupWhileReplicaCatchupTest extends FailoverTestBase {
}
for (int i = 0; i < NUMBER_OF_RESTARTS; i++) {
- logger.debug("Starting replica " + i);
+ logger.debug("Starting replica {}", i);
backupServer.start();
Wait.assertTrue(backupServer.getServer()::isReplicaSync);
backupServer.stop();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.java
index 700da3d78a..7171978c7d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.java
@@ -43,12 +43,13 @@ import org.apache.activemq.artemis.quorum.file.FileBasedPrimitiveManager;
import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTest;
import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
import org.apache.activemq.artemis.tests.util.Wait;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PluggableQuorumNettyNoGroupNameReplicatedFailoverTest extends FailoverTest {
- private static final Logger log = Logger.getLogger(PluggableQuorumReplicatedLargeMessageFailoverTest.class);
+ private static final Logger log = LoggerFactory.getLogger(PluggableQuorumReplicatedLargeMessageFailoverTest.class);
protected void beforeWaitForRemoteBackupSynchronization() {
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumReplicatedLargeMessageFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumReplicatedLargeMessageFailoverTest.java
index a675200508..6c122300a5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumReplicatedLargeMessageFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumReplicatedLargeMessageFailoverTest.java
@@ -20,13 +20,14 @@ import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.core.config.ha.ReplicationBackupPolicyConfiguration;
import org.apache.activemq.artemis.tests.integration.cluster.failover.LargeMessageFailoverTest;
import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.tests.integration.cluster.failover.quorum.PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.doDecrementActivationSequenceForForceRestartOf;
public class PluggableQuorumReplicatedLargeMessageFailoverTest extends LargeMessageFailoverTest {
- private static final Logger log = Logger.getLogger(PluggableQuorumReplicatedLargeMessageFailoverTest.class);
+ private static final Logger log = LoggerFactory.getLogger(PluggableQuorumReplicatedLargeMessageFailoverTest.class);
@Override
protected void createConfigs() throws Exception {
createPluggableReplicatedConfigs();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index 9dfddb2672..9a14cd9053 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -39,13 +39,14 @@ import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReattachSupportTestBase {
- private static final Logger log = Logger.getLogger(MultiThreadRandomReattachTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MultiThreadRandomReattachTestBase.class);
private static final int RECEIVE_TIMEOUT = 30000;
@@ -537,7 +538,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestD(final ClientSessionFactory sf, final int threadNum) throws Exception {
@@ -662,7 +663,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
// Now with synchronous receive()
@@ -721,7 +722,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestF(final ClientSessionFactory sf, final int threadNum) throws Exception {
@@ -780,7 +781,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestG(final ClientSessionFactory sf, final int threadNum) throws Exception {
@@ -853,7 +854,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestH(final ClientSessionFactory sf, final int threadNum) throws Exception {
@@ -928,7 +929,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestI(final ClientSessionFactory sf, final int threadNum) throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
index 4da1bd930e..56be4e1647 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
@@ -31,15 +31,16 @@ import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImp
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RetryRule;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(MultiThreadReattachSupportTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MultiThreadReattachSupportTestBase.class);
@Rule
public RetryRule retryRule = new RetryRule(2);
@@ -76,7 +77,7 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
final boolean failOnCreateConnection,
final long failDelay) throws Exception {
for (int its = 0; its < numIts; its++) {
- log.debug("Beginning iteration " + its);
+ log.debug("Beginning iteration {}", its);
start();
@@ -185,7 +186,7 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
public void checkFail() {
if (throwable != null) {
- log.error("Test failed: " + failReason, throwable);
+ log.error("Test failed: {}", failReason, throwable);
}
if (failReason != null) {
Assert.fail(failReason);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
index 66fb6604dd..880224106c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -43,19 +43,20 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RetryRule;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RandomReattachTest extends ActiveMQTestBase {
@Rule
public RetryRule retryRule = new RetryRule(2);
- private static final Logger log = Logger.getLogger(RandomReattachTest.class);
+ private static final Logger log = LoggerFactory.getLogger(RandomReattachTest.class);
private static final int RECEIVE_TIMEOUT = 10000;
@@ -203,7 +204,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
final int numIts = getNumIterations();
for (int its = 0; its < numIts; its++) {
- log.debug("####" + getName() + " iteration #" + its);
+ log.debug("####{} iteration #{}", getName(), its);
start();
ServerLocator locator = createInVMNonHALocator().setReconnectAttempts(15).setConfirmationWindowSize(1024 * 1024);
@@ -321,7 +322,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestB(final ClientSessionFactory sf) throws Exception {
@@ -420,7 +421,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
@@ -561,7 +562,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestD(final ClientSessionFactory sf) throws Exception {
@@ -696,7 +697,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
// Now with synchronous receive()
@@ -774,7 +775,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestF(final ClientSessionFactory sf) throws Exception {
@@ -858,7 +859,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestG(final ClientSessionFactory sf) throws Exception {
@@ -970,7 +971,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestH(final ClientSessionFactory sf) throws Exception {
@@ -1086,7 +1087,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
long end = System.currentTimeMillis();
- log.debug("duration " + (end - start));
+ log.debug("duration {}", (end - start));
}
protected void doTestI(final ClientSessionFactory sf) throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
index 011045ddeb..73e846a037 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
@@ -417,7 +417,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
@Override
public void debug(String message, Object... args) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format(message, args));
}
}