Github user gemmellr commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/2115#discussion_r191721270
--- Diff:
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java
---
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package
org.apache.activemq.artemis.tests.integration.cluster.crossprotocol;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
+import org.apache.activemq.artemis.core.server.cluster.MessageFlowRecord;
+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.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import
org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManagerFactory;
+import
org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(value = Parameterized.class)
+public class ProtocolsMessageLoadBalancingTest extends ClusterTestBase {
+
+ private static final int NUMBER_OF_SERVERS = 2;
+ private static final SimpleString queueName =
SimpleString.toSimpleString("queues.0");
+
+
+ // I'm taking any number that /2 = Odd
+ // to avoid perfect roundings and making sure messages are evenly
distributed
+ private static final int NUMBER_OF_MESSAGES = 77 * 2;
+
+
+ @Parameterized.Parameters(name = "protocol={0}")
+ public static Collection getParameters() {
+ return Arrays.asList(new Object[][]{{"AMQP"}, {"CORE"}});
+ }
+
+ @Parameterized.Parameter(0)
+ public String protocol;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ }
+
+ private void startServers(MessageLoadBalancingType loadBalancingType)
throws Exception {
+ setupServers();
+
+ setRedistributionDelay(0);
+
+ setupCluster(loadBalancingType);
+
+ AddressSettings as = new
AddressSettings().setRedistributionDelay(0).setExpiryAddress(SimpleString.toSimpleString("queues.expiry"));
+
+ getServer(0).getAddressSettingsRepository().addMatch("queues.*", as);
+ getServer(1).getAddressSettingsRepository().addMatch("queues.*", as);
+
+ startServers(0);
+ startServers(1);
+
+ createQueue(SimpleString.toSimpleString("queues.expiry"));
+ createQueue(queueName);
+ }
+
+ private void createQueue(SimpleString queueName) throws Exception {
+ servers[0].createQueue(queueName, RoutingType.ANYCAST, queueName,
(SimpleString) null, (SimpleString) null, true, false, false, false, false, -1,
false, false, false, true);
+ servers[1].createQueue(queueName, RoutingType.ANYCAST, queueName,
(SimpleString) null, (SimpleString) null, true, false, false, false, false, -1,
false, false, false, true);
+ }
+
+ protected boolean isNetty() {
+ return true;
+ }
+
+ private ConnectionFactory getJmsConnectionFactory(int node) {
+ if (protocol.equals("AMQP")) {
+ return new JmsConnectionFactory("amqp://localhost:" + (61616 +
node));
+ } else {
+ return new ActiveMQConnectionFactory("tcp://localhost:" + (61616
+ node));
+ }
+ }
+
+ private void pauseClusteringBridges(ActiveMQServer server) throws
Exception {
+ for (ClusterConnection clusterConnection :
server.getClusterManager().getClusterConnections()) {
+ for (MessageFlowRecord record :
((ClusterConnectionImpl)clusterConnection).getRecords().values()) {
+ record.getBridge().pause();
+ }
+ }
+ }
+
+ @Test
+ public void testLoadBalancing() throws Exception {
+
+ startServers(MessageLoadBalancingType.STRICT);
+
+ ConnectionFactory[] factory = new
ConnectionFactory[NUMBER_OF_SERVERS];
+ Connection[] connection = new Connection[NUMBER_OF_SERVERS];
+ Session[] session = new Session[NUMBER_OF_SERVERS];
+ MessageConsumer[] consumer = new MessageConsumer[NUMBER_OF_SERVERS];
+
+ // this will pre create consumers to make sure messages are
distributed evenly without redistribution
+ for (int node = 0; node < NUMBER_OF_SERVERS; node++) {
+ factory[node] = getJmsConnectionFactory(node);
+ connection[node] = factory[node].createConnection();
+ session[node] = connection[node].createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ consumer[node] =
session[node].createConsumer(session[node].createQueue(queueName.toString()));
+ }
+
+ waitForBindings(0, "queues.0", 1, 1, true);
+ waitForBindings(1, "queues.0", 1, 1, true);
+
+ waitForBindings(0, "queues.0", 1, 1, false);
+ waitForBindings(1, "queues.0", 1, 1, false);
+
+ pauseClusteringBridges(servers[0]);
+
+
+ // sending Messages.. they should be load balanced
+ {
+ ConnectionFactory cf = getJmsConnectionFactory(0);
+ Connection cn = cf.createConnection();
+ Session sn = cn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer pd =
sn.createProducer(sn.createQueue(queueName.toString()));
+
+ for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
+ pd.send(sn.createTextMessage("hello " + i));
+ }
+
+ cn.close();
+ }
+
+ receiveMessages(connection[0], consumer[0], NUMBER_OF_MESSAGES / 2);
+ connection[1].start();
+ Assert.assertNull(consumer[1].receiveNoWait());
+ connection[1].stop();
+
+ servers[0].stop();
+ clearServer(0);
+
+ setupServer(0, isFileStorage(), isNetty());
+ servers[0].addProtocolManagerFactory(new
ProtonProtocolManagerFactory());
+
+ setupClusterConnection("cluster0", "queues",
MessageLoadBalancingType.STRICT, 1, isNetty(), 0, 1);
+
+ servers[0].start();
+
+ receiveMessages(connection[1], consumer[1], NUMBER_OF_MESSAGES / 2);
+ for (int node = 0; node < NUMBER_OF_SERVERS; node++) {
+ connection[node].close();
+ }
+
+ }
+
+ @Test
+ public void testExpireRedistributed() throws Exception {
+
+ startServers(MessageLoadBalancingType.ON_DEMAND);
+
+ ConnectionFactory factory = getJmsConnectionFactory(1);
+
+
+ waitForBindings(0, "queues.0", 1, 0, true);
+ waitForBindings(1, "queues.0", 1, 0, true);
+
+ waitForBindings(0, "queues.0", 1, 0, false);
+ waitForBindings(1, "queues.0", 1, 0, false);
+
+
+ // sending Messages..
+ {
+ ConnectionFactory cf = getJmsConnectionFactory(0);
+ Connection cn = cf.createConnection();
+ Session sn = cn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer pd =
sn.createProducer(sn.createQueue(queueName.toString()));
+ pd.setTimeToLive(200);
+
+ for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
+ pd.send(sn.createTextMessage("hello " + i));
+ }
+
+ cn.close();
+ }
+
+ // time to let stuff expire
+ Thread.sleep(200);
+
+
+ Connection connection = factory.createConnection();
+ Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumer =
session.createConsumer(session.createQueue("queues.expiry"));
+
+ receiveMessages(connection, consumer, NUMBER_OF_MESSAGES);
+ connection.close();
+ }
+
+ private void receiveMessages(Connection connection,
+ MessageConsumer messageConsumer,
+ int messageCount) throws JMSException {
+ connection.start();
+
+ for (int i = 0; i < messageCount; i++) {
+ Message msg = messageConsumer.receive(5000);
+ }
+
+ Assert.assertNull(messageConsumer.receiveNoWait());
--- End diff --
I think the tests would be clearer to read if this assert was in the test
method, or receiveMessages was renamed to convey it checks there are no more.
---
