You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/10/23 14:55:37 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2135 Test multiple core
consumers receiving amqp messages
Repository: activemq-artemis
Updated Branches:
refs/heads/master 5269df852 -> e380eeb83
ARTEMIS-2135 Test multiple core consumers receiving amqp messages
This test can verify an issue fixed by the commit:
7a463f038ae324f2c5c908321b2ebf03b5a8e303 (ARTEMIS-2096)
The issue was reported later by users where messages
sent by amqp clients are having their body size
randomly being zero when received by multiple core
consumers.
This was also fixed on commit 48e0fc8f42346d96bc809593a150e05a586787e but that
was exclusively on 2.6.x branch.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f4c93a28
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f4c93a28
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f4c93a28
Branch: refs/heads/master
Commit: f4c93a2860f384ce87e3589012e5278399c550c3
Parents: 5269df8
Author: Howard Gao <ho...@gmail.com>
Authored: Fri Oct 19 21:40:33 2018 +0800
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 23 10:52:50 2018 -0400
----------------------------------------------------------------------
.../integration/amqp/interop/AmqpCoreTest.java | 134 +++++++++++++++++++
1 file changed, 134 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f4c93a28/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java
new file mode 100644
index 0000000..5d07d2a
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.amqp.interop;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.junit.Wait;
+import org.apache.activemq.artemis.tests.integration.amqp.JMSClientTestSupport;
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.apache.qpid.jms.JmsTopic;
+import org.junit.Test;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+public class AmqpCoreTest extends JMSClientTestSupport {
+
+ @Override
+ protected String getConfiguredProtocols() {
+ return "AMQP,OPENWIRE,CORE";
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Test
+ public void testMultipleCoreReceiving() throws Exception {
+
+ Connection coreJmsConn = this.createCoreConnection();
+
+ final int total = 100;
+
+ try {
+ Session session = coreJmsConn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ ClientSession coreSession = ((ActiveMQSession) session).getCoreSession();
+ coreSession.createQueue("exampleQueueAddress", RoutingType.MULTICAST, "exampleQueue1");
+ coreSession.createQueue("exampleQueueAddress", RoutingType.MULTICAST, "exampleQueue2");
+ coreSession.createQueue("exampleQueueAddress", RoutingType.MULTICAST, "exampleQueue3");
+
+ ClientConsumer consumer1 = coreSession.createConsumer("exampleQueue1");
+ CoreMessageHandler handler1 = new CoreMessageHandler(1);
+ consumer1.setMessageHandler(handler1);
+ ClientConsumer consumer2 = coreSession.createConsumer("exampleQueue2");
+ CoreMessageHandler handler2 = new CoreMessageHandler(2);
+ consumer2.setMessageHandler(handler2);
+ CoreMessageHandler handler3 = new CoreMessageHandler(3);
+ ClientConsumer consumer3 = coreSession.createConsumer("exampleQueue3");
+ consumer3.setMessageHandler(handler3);
+
+ sendAmqpMessages("exampleQueueAddress", total);
+
+ assertTrue("not enough message received: " + handler1.getNumMsg() + " expected: " + total, handler1.waitForMessages(total));
+ assertTrue("not enough message received: " + handler2.getNumMsg() + " expected: " + total, handler2.waitForMessages(total));
+ assertTrue("not enough message received: " + handler3.getNumMsg() + " expected: " + total, handler3.waitForMessages(total));
+
+
+ } finally {
+ coreJmsConn.close();
+ }
+ }
+
+ private void sendAmqpMessages(String address, int total) throws Exception {
+ ConnectionFactory cfAMQP = new JmsConnectionFactory("amqp://127.0.0.1:" + AMQP_PORT);
+ Connection connectionAMQP = cfAMQP.createConnection();
+ try {
+ connectionAMQP.start();
+ Session sessionAMQP = connectionAMQP.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer sender = sessionAMQP.createProducer(new JmsTopic(address));
+
+ for (int i = 0; i < total; i++) {
+ sender.send(sessionAMQP.createTextMessage("hello"));
+ }
+ } finally {
+ connectionAMQP.close();
+ }
+ }
+
+ private class CoreMessageHandler implements MessageHandler {
+ int id;
+ int numMsg = 0;
+ volatile boolean zeroLen = false;
+
+ CoreMessageHandler(int id) {
+ this.id = id;
+ }
+
+ @Override
+ public void onMessage(ClientMessage message) {
+ System.out.println("received: " + message.getBodySize());
+ if (message.getBodySize() == 0) {
+ System.out.println("xxx found zero len message!");
+ zeroLen = true;
+ }
+ addMessage(message);
+ }
+
+ private synchronized void addMessage(ClientMessage message) {
+ numMsg++;
+ System.out.println("[receiver " + id + "] recieved: " + numMsg);
+ }
+
+ public synchronized boolean waitForMessages(int num) throws Exception {
+ assertFalse(zeroLen);
+ return Wait.waitFor(() -> numMsg == num, 30000);
+ }
+
+ public int getNumMsg() {
+ return numMsg;
+ }
+ }
+
+}
[2/2] activemq-artemis git commit: This closes #2383
Posted by cl...@apache.org.
This closes #2383
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e380eeb8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e380eeb8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e380eeb8
Branch: refs/heads/master
Commit: e380eeb83c12e1b7c2c14ca1c28fec3dfba0c1b2
Parents: 5269df8 f4c93a2
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Oct 23 10:55:29 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 23 10:55:29 2018 -0400
----------------------------------------------------------------------
.../integration/amqp/interop/AmqpCoreTest.java | 134 +++++++++++++++++++
1 file changed, 134 insertions(+)
----------------------------------------------------------------------