Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-876 Internalise Cluster Namespace and remove JMS Prefix

This commit is contained in:
Martyn Taylor 2016-11-07 11:36:18 +00:00
parent 84e8a87325
commit 0006627d12
18 changed files with 148 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View File

@ -22,12 +22,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<jms xmlns="urn:activemq:jms">
<queue name="DLQ"/>
<queue name="ExpiryQueue"/>${jms-list.settings}
</jms>
<core xmlns="urn:activemq:core">
<core xmlns="urn:activemq:core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq:core ">
<name>${name}</name>
@ -89,8 +85,8 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
<address-settings>
<!--default for catch all-->
<address-setting match="#">
<dead-letter-address>jms.queue.DLQ</dead-letter-address>
<expiry-address>jms.queue.ExpiryQueue</expiry-address>
<dead-letter-address>DLQ</dead-letter-address>
<expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<!-- with -1 only the global-max-size is in use for limiting -->
<max-size-bytes>-1</max-size-bytes>
@ -98,5 +94,19 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
<address-full-policy>PAGE</address-full-policy>
</address-setting>
</address-settings>
<addresses>
<address name="DLQ" type="anycast">
<queues>
<queue name="DLQ" />
</queues>
</address>
<address name="ExpiryQueue" type="anycast">
<queues>
<queue name="ExpiryQueue" />
</queues>
</address>
</addresses>
</core>
</configuration>

1
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
View File

@ -18,7 +18,6 @@
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
<connector-ref>artemis</connector-ref>
<message-load-balancing>${message-load-balancing}</message-load-balancing>
<max-hops>${max-hops}</max-hops>

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
View File

@ -453,6 +453,8 @@ public final class ActiveMQDefaultConfiguration {
public static String DEFAULT_NETWORK_CHECK_NIC = null;
public static final String DEFAULT_INTERNAL_NAMING_PREFIX = "$.artemis.internal.";
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
*/
@ -1199,6 +1201,10 @@ public final class ActiveMQDefaultConfiguration {
return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
}
public static String getInternalNamingPrefix() {
return DEFAULT_INTERNAL_NAMING_PREFIX;
}
public static String getDefaultSystemPropertyPrefix() {
return DEFAULT_SYSTEM_PROPERTY_PREFIX;
}

32
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
View File

@ -299,19 +299,31 @@ public class ActiveMQSession implements QueueSession, TopicSession {
if (jbd != null) {
ClientSession.AddressQuery response = session.addressQuery(jbd.getSimpleAddress());
if (!response.isExists() && response.isAutoCreateJmsQueues()) {
if (jbd.isQueue()) {
session.createAddress(jbd.getSimpleAddress(), false);
session.createQueue(jbd.getSimpleAddress(), jbd.getSimpleAddress(), null, true);
} else {
session.createAddress(jbd.getSimpleAddress(), true);
if (jbd.isQueue()) {
if (!response.isExists()) {
if (response.isAutoCreateJmsQueues()) {
session.createAddress(jbd.getSimpleAddress(), false);
} else {
throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist");
}
}
} else if (!response.isExists() && !response.isAutoCreateJmsQueues()) {
throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist");
if (response.getQueueNames().isEmpty()) {
if (response.isAutoCreateJmsQueues()) {
session.createQueue(jbd.getSimpleAddress(), jbd.getSimpleAddress(), null, true);
} else {
throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist");
}
}
} else {
if (!response.isExists()) {
if (response.isAutoCreateJmsTopics()) {
session.createAddress(jbd.getSimpleAddress(), true);
} else {
throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist");
}
}
}
connection.addKnownDestination(jbd.getSimpleAddress());
}
ClientProducer producer = session.createProducer(jbd == null ? null : jbd.getSimpleAddress());

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
View File

@ -1038,6 +1038,8 @@ public interface Configuration {
Configuration setMaxDiskUsage(int maxDiskUsage);
ConfigurationImpl setInternalNamingPrefix(String internalNamingPrefix);
Configuration setDiskScanPeriod(int diskScanPeriod);
int getDiskScanPeriod();
@ -1078,4 +1080,5 @@ public interface Configuration {
Configuration setNetworkCheckPing6Command(String command);
String getInternalNamingPrefix();
}

13
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -279,6 +279,8 @@ public class ConfigurationImpl implements Configuration, Serializable {
private String networkCheckPing6Command = NetworkHealthCheck.IPV6_DEFAULT_COMMAND;
private String internalNamingPrefix = ActiveMQDefaultConfiguration.getInternalNamingPrefix();
/**
* Parent folder for all data folders.
*/
@ -1900,6 +1902,17 @@ public class ConfigurationImpl implements Configuration, Serializable {
return diskScanPeriod;
}
@Override
public String getInternalNamingPrefix() {
return internalNamingPrefix;
}
@Override
public ConfigurationImpl setInternalNamingPrefix(String internalNamingPrefix) {
this.internalNamingPrefix = internalNamingPrefix;
return this;
}
@Override
public ConfigurationImpl setDiskScanPeriod(int diskScanPeriod) {
this.diskScanPeriod = diskScanPeriod;

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
View File

@ -183,6 +183,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
private static final String DISK_SCAN_PERIOD = "disk-scan-period";
private static final String INTERNAL_NAMING_PREFIX = "internal-naming-prefix";
// Attributes ----------------------------------------------------
private boolean validateAIO = false;
@ -298,6 +300,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
config.setDiskScanPeriod(getInteger(e, DISK_SCAN_PERIOD, config.getDiskScanPeriod(), Validators.MINUS_ONE_OR_GT_ZERO));
config.setInternalNamingPrefix(getString(e, INTERNAL_NAMING_PREFIX, config.getInternalNamingPrefix(), Validators.NO_CHECK));
// parsing cluster password
String passwordText = getString(e, "cluster-password", null, Validators.NO_CHECK);

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
View File

@ -473,7 +473,11 @@ public interface ActiveMQServer extends ActiveMQComponent {
void removeClientConnection(String clientId);
AddressInfo putAddressInfoIfAbsent(AddressInfo addressInfo) throws Exception;
AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo) throws Exception;
AddressInfo removeAddressInfo(SimpleString address) throws Exception;
String getInternalNamingPrefix();
}

22
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
View File

@ -78,6 +78,8 @@ public class ClusterConnectionBridge extends BridgeImpl {
private final ServerLocatorInternal discoveryLocator;
private final String storeAndForwardPrefix;
public ClusterConnectionBridge(final ClusterConnection clusterConnection,
final ClusterManager clusterManager,
final ServerLocatorInternal targetLocator,
@ -104,7 +106,8 @@ public class ClusterConnectionBridge extends BridgeImpl {
final SimpleString managementAddress,
final SimpleString managementNotificationAddress,
final MessageFlowRecord flowRecord,
final TransportConfiguration connector) {
final TransportConfiguration connector,
final String storeAndForwardPrefix) {
super(targetLocator, initialConnectAttempts, reconnectAttempts, 0, // reconnectAttemptsOnSameNode means nothing on the clustering bridge since we always try the same
retryInterval, retryMultiplier, maxRetryInterval, nodeUUID, name, queue, executor, filterString, forwardingAddress, scheduledExecutor, transformer, useDuplicateDetection, user, password, storageManager);
@ -128,6 +131,8 @@ public class ClusterConnectionBridge extends BridgeImpl {
if (logger.isTraceEnabled()) {
logger.trace("Setting up bridge between " + clusterConnection.getConnector() + " and " + targetLocator, new Exception("trace"));
}
this.storeAndForwardPrefix = storeAndForwardPrefix;
}
@Override
@ -216,6 +221,8 @@ public class ClusterConnectionBridge extends BridgeImpl {
SimpleString notifQueueName = new SimpleString(qName);
String filterString = flowRecord.getAddress();
SimpleString filter = new SimpleString(ManagementHelper.HDR_BINDING_TYPE + "<>" +
BindingType.DIVERT.toInt() +
" AND " +
@ -239,7 +246,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
"<" +
flowRecord.getMaxHops() +
" AND (" +
createSelectorFromAddress(flowRecord.getAddress()) +
createSelectorFromAddress(appendIgnoresToFilter(flowRecord.getAddress())) +
")");
sessionConsumer.createTemporaryQueue(managementNotificationAddress, notifQueueName, filter);
@ -266,6 +273,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
}
}
/**
* Takes in a string of an address filter or comma separated list and generates an appropriate JMS selector for
* filtering queues.
@ -332,6 +340,16 @@ public class ClusterConnectionBridge extends BridgeImpl {
return builder.toString();
}
private String appendIgnoresToFilter(String filterString) {
if (filterString != null && !filterString.isEmpty()) {
filterString += ",";
}
filterString += "!" + storeAndForwardPrefix;
filterString += ",!" + managementAddress;
filterString += ",!" + managementNotificationAddress;
return filterString;
}
@Override
protected void afterConnect() throws Exception {
super.afterConnect();

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
View File

@ -76,6 +76,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
private static final Logger logger = Logger.getLogger(ClusterConnectionImpl.class);
private static final String SN_PREFIX = "sf.";
/**
* When getting member on node-up and down we have to remove the name from the transport config
* as the setting we build here doesn't need to consider the name, so use the same name on all
@ -170,6 +171,8 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
private final int clusterNotificationAttempts;
private final String storeAndForwardPrefix;
public ClusterConnectionImpl(final ClusterManager manager,
final TransportConfiguration[] staticTranspConfigs,
final TransportConfiguration connector,
@ -277,6 +280,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
}
}
this.storeAndForwardPrefix = server.getInternalNamingPrefix() + SN_PREFIX;
}
public ClusterConnectionImpl(final ClusterManager manager,
@ -375,6 +379,8 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
clusterConnector = new DiscoveryClusterConnector(dg);
this.manager = manager;
this.storeAndForwardPrefix = server.getInternalNamingPrefix() + SN_PREFIX;
}
@Override
@ -702,7 +708,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
// New node - create a new flow record
final SimpleString queueName = new SimpleString("sf." + name + "." + nodeID);
final SimpleString queueName = new SimpleString(storeAndForwardPrefix + name + "." + nodeID);
Binding queueBinding = postOffice.getBinding(queueName);
@ -799,7 +805,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
targetLocator.addIncomingInterceptor(new IncomingInterceptorLookingForExceptionMessage(manager, executorFactory.getExecutor()));
MessageFlowRecordImpl record = new MessageFlowRecordImpl(targetLocator, eventUID, targetNodeID, connector, queueName, queue);
ClusterConnectionBridge bridge = new ClusterConnectionBridge(this, manager, targetLocator, serverLocator, initialConnectAttempts, reconnectAttempts, retryInterval, retryIntervalMultiplier, maxRetryInterval, nodeManager.getUUID(), record.getEventUID(), record.getTargetNodeID(), record.getQueueName(), record.getQueue(), executorFactory.getExecutor(), null, null, scheduledExecutor, null, useDuplicateDetection, clusterUser, clusterPassword, server.getStorageManager(), managementService.getManagementAddress(), managementService.getManagementNotificationAddress(), record, record.getConnector());
ClusterConnectionBridge bridge = new ClusterConnectionBridge(this, manager, targetLocator, serverLocator, initialConnectAttempts, reconnectAttempts, retryInterval, retryIntervalMultiplier, maxRetryInterval, nodeManager.getUUID(), record.getEventUID(), record.getTargetNodeID(), record.getQueueName(), record.getQueue(), executorFactory.getExecutor(), null, null, scheduledExecutor, null, useDuplicateDetection, clusterUser, clusterPassword, server.getStorageManager(), managementService.getManagementAddress(), managementService.getManagementNotificationAddress(), record, record.getConnector(), storeAndForwardPrefix);
targetLocator.setIdentity("(Cluster-connection-bridge::" + bridge.toString() + "::" + this.toString() + ")");

34
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -172,6 +172,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private static final Logger logger = Logger.getLogger(ActiveMQServerImpl.class);
public static final String INTERNAL_NAMING_PREFIX = "$.artemis.internal";
/**
* JMS Topics (which are outside of the scope of the core API) will require a dumb subscription
* with a dummy-filter at this current version as a way to keep its existence valid and TCK
@ -719,7 +721,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
return new BindingQueryResult(!names.isEmpty(), names, autoCreateJmsQueues, autoCreateJmsTopics);
if (autoCreateJmsTopics) {
putAddressInfoIfAbsent(new AddressInfo(address));
}
return new BindingQueryResult(getAddressInfo(address) != null, names, autoCreateJmsQueues, autoCreateJmsTopics);
}
@Override
@ -2220,14 +2226,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private void deployQueuesFromListCoreQueueConfiguration(List<CoreQueueConfiguration> queues) throws Exception {
for (CoreQueueConfiguration config : queues) {
deployQueue(SimpleString.toSimpleString(config.getAddress()),
SimpleString.toSimpleString(config.getName()),
SimpleString.toSimpleString(config.getFilterString()),
config.isDurable(),
false,
false,
config.getMaxConsumers(),
config.getDeleteOnNoConsumers());
deployQueue(SimpleString.toSimpleString(config.getAddress()), SimpleString.toSimpleString(config.getName()), SimpleString.toSimpleString(config.getFilterString()), config.isDurable(), false, false, config.getMaxConsumers(), config.getDeleteOnNoConsumers());
}
}
@ -2330,6 +2329,18 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
@Override
public AddressInfo putAddressInfoIfAbsent(AddressInfo addressInfo) throws Exception {
AddressInfo result = postOffice.addAddressInfo(addressInfo);
// TODO: is this the right way to do this?
long txID = storageManager.generateID();
storageManager.addAddressBinding(txID, addressInfo);
storageManager.commitBindings(txID);
return result;
}
@Override
public AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo) throws Exception {
AddressInfo result = postOffice.addOrUpdateAddressInfo(addressInfo);
@ -2354,6 +2365,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
return result;
}
@Override
public String getInternalNamingPrefix() {
return configuration.getInternalNamingPrefix();
}
@Override
public AddressInfo getAddressInfo(SimpleString address) {
return postOffice.getAddressInfo(address);

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
View File

@ -128,7 +128,8 @@ public class ScaleDownHandler {
}
}
if (address.toString().startsWith("sf.")) {
String sfPrefix = ((PostOfficeImpl) postOffice).getServer().getInternalNamingPrefix() + "sf.";
if (address.toString().startsWith(sfPrefix)) {
messageCount += scaleDownSNF(address, queues, producer);
} else {
messageCount += scaleDownRegularMessages(address, queues, session, producer);

70
artemis-server/src/main/resources/schema/artemis-configuration.xsd
View File

@ -42,6 +42,16 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="internal-naming-prefix" type="xsd:string" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Artemis uses internal queues and addresses for implmenting certain behaviours. These queues and addresses
will be prefixed by default with "$.activemq.internal" to avoid naming clashes with user namespacing.
This can be overriden by setting this value to a valid Artemis address.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="resolve-protocols" type="xsd:boolean" default="true" maxOccurs="1"
minOccurs="0">
<xsd:annotation>
@ -871,66 +881,6 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="network-check-list" type="xsd:string" default="" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A comma separated list of IPs to be used to validate if the broker should be kept up
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-URL-list" type="xsd:string" default="" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A comma separated list of URLs to be used to validate if the broker should be kept up
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-period" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A frequency in milliseconds to how often we should check if the network is still up
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-timeout" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A timeout used in milliseconds to be used on the ping.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-NIC" type="xsd:string" default="" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
The network interface card name to be used to validate the address.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-ping-command" type="xsd:string" default="" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
The ping command used to ping IPV4 addresses.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="network-check-ping6-command" type="xsd:string" default="" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
The ping command used to ping IPV6 addresses.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="addresses" type="addressesType" maxOccurs="1" minOccurs="0" />
</xsd:all>
</xsd:complexType>

2
artemis-tools/src/test/resources/artemis-configuration.xsd
View File

@ -1265,7 +1265,7 @@
<xsd:complexType name="cluster-connectionType">
<xsd:sequence>
<xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
<xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
name of the address this cluster connection applies to

13
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
View File

@ -26,6 +26,7 @@ import javax.jms.Session;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQXAConnectionFactory;
@ -60,23 +61,21 @@ public class AMQPToOpenwireTest extends ActiveMQTestBase {
public void setUp() throws Exception {
super.setUp();
server = createServer(true, true);
serverManager = new JMSServerManagerImpl(server);
server.start();
server.waitForActivation(10, TimeUnit.SECONDS);
Configuration serverConfig = server.getConfiguration();
serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
serverConfig.setSecurityEnabled(false);
serverManager.start();
coreQueue = new SimpleString(queueName);
this.server.createQueue(coreQueue, coreQueue, null, false, false);
server.createQueue(coreQueue, coreQueue, null, false, false);
qpidfactory = new JmsConnectionFactory("amqp://localhost:61616");
}
@Override
@After
public void tearDown() throws Exception {
if (serverManager != null) {
serverManager.stop();
serverManager = null;
}
server.stop();
}
@Test

6
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
View File

@ -1042,7 +1042,7 @@ public class MQTTTest extends MQTTTestSupport {
initializeConnection(provider);
// send retained message
final String address = "jms/queue/" + mqttAddress;
final String address = mqttAddress;
final String RETAINED = "RETAINED";
final byte[] payload = RETAINED.getBytes();
@ -1088,7 +1088,7 @@ public class MQTTTest extends MQTTTestSupport {
public void doTestSendJMSReceiveMQTT(String destinationName) throws Exception {
final MQTTClientProvider provider = getMQTTClientProvider();
initializeConnection(provider);
provider.subscribe("jms/queue/foo/+", AT_MOST_ONCE);
provider.subscribe("foo/+", AT_MOST_ONCE);
Connection connection = cf.createConnection();
connection.start();
@ -1279,7 +1279,7 @@ public class MQTTTest extends MQTTTestSupport {
// publish
for (int i = 0; i < messagesToSend; ++i) {
connection.publish("jms/queue/test/foo", "hello world".getBytes(), QoS.AT_LEAST_ONCE, false);
connection.publish("test/foo", "hello world".getBytes(), QoS.AT_LEAST_ONCE, false);
}
connection.disconnect();

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java
View File

@ -117,7 +117,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase {
createQueue(2, addressName, queueName1, null, false, servers[2].getConfiguration().getClusterUser(), servers[2].getConfiguration().getClusterPassword());
// pause the SnF queue so that when the server tries to redistribute a message it won't actually go across the cluster bridge
String snfAddress = "sf.cluster0." + servers[0].getNodeID().toString();
String snfAddress = servers[0].getInternalNamingPrefix() + "sf.cluster0." + servers[0].getNodeID().toString();
Queue snfQueue = ((LocalQueueBinding) servers[2].getPostOffice().getBinding(SimpleString.toSimpleString(snfAddress))).getQueue();
snfQueue.pause();
@ -260,7 +260,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase {
createQueue(2, addressName, queueName3, null, false, servers[2].getConfiguration().getClusterUser(), servers[2].getConfiguration().getClusterPassword());
// pause the SnF queue so that when the server tries to redistribute a message it won't actually go across the cluster bridge
String snfAddress = "sf.cluster0." + servers[0].getNodeID().toString();
String snfAddress = servers[0].getInternalNamingPrefix() + "sf.cluster0." + servers[0].getNodeID().toString();
Queue snfQueue = ((LocalQueueBinding) servers[2].getPostOffice().getBinding(SimpleString.toSimpleString(snfAddress))).getQueue();
snfQueue.pause();

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
View File

@ -163,7 +163,7 @@ public class ScaleDownTest extends ClusterTestBase {
for (Map.Entry<SimpleString, Binding> entry : servers[0].getPostOffice().getAllBindings().entrySet()) {
String temp = entry.getValue().getAddress().toString();
if (temp.startsWith("sf.") && temp.endsWith(servers[1].getNodeID().toString())) {
if (temp.startsWith(servers[1].getInternalNamingPrefix() + "sf.") && temp.endsWith(servers[1].getNodeID().toString())) {
// we found the sf queue for the other node
// need to pause the sfQueue here
((LocalQueueBinding) entry.getValue()).getQueue().pause();