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/09/11 20:35:22 UTC
[1/2] activemq-artemis git commit: This closes #2299
Repository: activemq-artemis
Updated Branches:
refs/heads/master ff0e7ef4b -> 0f8942b66
This closes #2299
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0f8942b6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0f8942b6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0f8942b6
Branch: refs/heads/master
Commit: 0f8942b66ac0d97d4c02af81dcc5d075ae9ec06b
Parents: ff0e7ef 7a7304b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Sep 11 16:35:15 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 11 16:35:15 2018 -0400
----------------------------------------------------------------------
.../amqp/converter/CoreAmqpConverter.java | 10 +-
.../nullpm/NullStorageLargeServerMessage.java | 11 +-
.../spi/core/protocol/EmbedMessageUtil.java | 4 +-
.../AMQPLargeMessageClusterTest.java | 165 +++++++++++++++++++
4 files changed, 184 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-2078 AMQP large msg aren't
consumed by clusters without persistence
Posted by cl...@apache.org.
ARTEMIS-2078 AMQP large msg aren't consumed by clusters without persistence
NullStorageLargeServerMessage is not correctly exposing its body buffer
to allow CoreAmqpConverter to convert it into an AMQPMessage
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a7304bb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a7304bb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a7304bb
Branch: refs/heads/master
Commit: 7a7304bb286b334c21afe3131c5957f3762116bc
Parents: ff0e7ef
Author: Francesco Nigro <ni...@gmail.com>
Authored: Fri Sep 7 11:13:19 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 11 16:35:15 2018 -0400
----------------------------------------------------------------------
.../amqp/converter/CoreAmqpConverter.java | 10 +-
.../nullpm/NullStorageLargeServerMessage.java | 11 +-
.../spi/core/protocol/EmbedMessageUtil.java | 4 +-
.../AMQPLargeMessageClusterTest.java | 165 +++++++++++++++++++
4 files changed, 184 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a7304bb/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java
index b287d0c..200321c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/CoreAmqpConverter.java
@@ -18,6 +18,7 @@
package org.apache.activemq.artemis.protocol.amqp.converter;
import static org.apache.activemq.artemis.api.core.FilterConstants.NATIVE_MESSAGE_ID;
+import static org.apache.activemq.artemis.api.core.Message.EMBEDDED_TYPE;
import static org.apache.activemq.artemis.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME;
import static org.apache.activemq.artemis.protocol.amqp.converter.AMQPMessageSupport.AMQP_DATA;
import static org.apache.activemq.artemis.protocol.amqp.converter.AMQPMessageSupport.AMQP_NULL;
@@ -82,6 +83,7 @@ import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPIllegalS
import org.apache.activemq.artemis.protocol.amqp.util.NettyWritable;
import org.apache.activemq.artemis.protocol.amqp.util.TLSEncode;
import org.apache.activemq.artemis.reader.MessageUtil;
+import org.apache.activemq.artemis.spi.core.protocol.EmbedMessageUtil;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.UnsignedByte;
@@ -120,7 +122,13 @@ public class CoreAmqpConverter {
if (coreMessage == null) {
return null;
}
-
+ if (coreMessage.isServerMessage() && coreMessage.isLargeMessage() && coreMessage.getType() == EMBEDDED_TYPE) {
+ //large AMQP messages received across cluster nodes
+ final Message message = EmbedMessageUtil.extractEmbedded(coreMessage);
+ if (message instanceof AMQPMessage) {
+ return (AMQPMessage) message;
+ }
+ }
ServerJMSMessage message = ServerJMSMessage.wrapCoreMessage(coreMessage);
message.decode();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a7304bb/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
index edd37b7..6280746 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
@@ -16,8 +16,10 @@
*/
package org.apache.activemq.artemis.core.persistence.impl.nullpm;
-import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import io.netty.buffer.Unpooled;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper;
import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.message.impl.CoreMessage;
import org.apache.activemq.artemis.core.server.LargeServerMessage;
@@ -39,7 +41,7 @@ class NullStorageLargeServerMessage extends CoreMessage implements LargeServerMe
@Override
public synchronized void addBytes(final byte[] bytes) {
if (buffer == null) {
- buffer = ActiveMQBuffers.dynamicBuffer(bytes.length).byteBuf();
+ buffer = Unpooled.buffer(bytes.length);
}
// expand the buffer
@@ -47,6 +49,11 @@ class NullStorageLargeServerMessage extends CoreMessage implements LargeServerMe
}
@Override
+ public synchronized ActiveMQBuffer getReadOnlyBodyBuffer() {
+ return new ChannelBufferWrapper(buffer.slice(0, buffer.writerIndex()).asReadOnly());
+ }
+
+ @Override
public void deleteFile() throws Exception {
// nothing to be done here.. we don really have a file on this Storage
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a7304bb/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java
index 8f4e102..53eb27b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/EmbedMessageUtil.java
@@ -51,9 +51,7 @@ public class EmbedMessageUtil {
ActiveMQBuffer buffer = message.getReadOnlyBodyBuffer();
if (buffer.readableBytes() < signature.length || !checkSignature(buffer)) {
- if (!logger.isTraceEnabled()) {
- logger.trace("Message type " + Message.EMBEDDED_TYPE + " was used for something other than embed messages, ignoring content and treating as a regular message");
- }
+ logger.tracef("Message type %d was used for something other than embed messages, ignoring content and treating as a regular message", Message.EMBEDDED_TYPE);
return message;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a7304bb/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AMQPLargeMessageClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AMQPLargeMessageClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AMQPLargeMessageClusterTest.java
new file mode 100644
index 0000000..e8ac13e
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AMQPLargeMessageClusterTest.java
@@ -0,0 +1,165 @@
+/**
+ * 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.distribution;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.util.Arrays;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManagerFactory;
+import org.apache.qpid.jms.JmsConnectionFactory;
+import org.hamcrest.core.IsInstanceOf;
+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 AMQPLargeMessageClusterTest extends ClusterTestBase {
+
+ private static final int RECEIVE_TIMEOUT_MILLIS = 20_000;
+ private static final int MESSAGE_SIZE = 1024 * 1024;
+ private static final int MESSAGES = 1;
+
+ private final boolean persistenceEnabled;
+ private final boolean compressLargeMessages;
+
+ @Parameterized.Parameters(name = "persistenceEnabled = {0}, compressLargeMessages = {1}")
+ public static Iterable<? extends Object> persistenceEnabled() {
+ return Arrays.asList(new Object[][]{{true, false}, {false, false}, {true, true}, {false, true}});
+ }
+
+ public AMQPLargeMessageClusterTest(boolean persistenceEnabled, boolean compressLargeMessages) {
+ this.persistenceEnabled = persistenceEnabled;
+ this.compressLargeMessages = compressLargeMessages;
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ start();
+ }
+
+ private void start() throws Exception {
+ setupServers();
+
+ setRedistributionDelay(0);
+ }
+
+ protected boolean isNetty() {
+ return true;
+ }
+
+ @Test(timeout = RECEIVE_TIMEOUT_MILLIS * (MESSAGES + 1))
+ public void testSendReceiveLargeMessage() throws Exception {
+ setupCluster(MessageLoadBalancingType.ON_DEMAND);
+
+ startServers(0, 1);
+
+ setupSessionFactory(0, isNetty());
+ setupSessionFactory(1, isNetty());
+ final String queueName = "queues.0";
+
+ createQueue(0, queueName, queueName, null, false, null, null, RoutingType.ANYCAST);
+ createQueue(1, queueName, queueName, null, false, null, null, RoutingType.ANYCAST);
+
+ waitForBindings(0, queueName, 1, 0, true);
+ waitForBindings(1, queueName, 1, 0, true);
+
+ waitForBindings(0, queueName, /**/1, 0, false);
+ waitForBindings(1, queueName, 1, 0, false);
+ String producerUri = "amqp://localhost:61616";
+ if (compressLargeMessages) {
+ producerUri = producerUri + "?compressLargeMessages=true";
+ }
+ final JmsConnectionFactory producerFactory = new JmsConnectionFactory(producerUri);
+ try (Connection producerConnection = producerFactory.createConnection(); Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE)) {
+ producerConnection.start();
+ final Destination queue = producerSession.createQueue(queueName);
+ String consumerUri = "amqp://localhost:61617";
+ if (compressLargeMessages) {
+ consumerUri = consumerUri + "?compressLargeMessages=true";
+ }
+ final JmsConnectionFactory consumerConnectionFactory = new JmsConnectionFactory(consumerUri);
+ try (Connection consumerConnection = consumerConnectionFactory.createConnection(); Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = consumerSession.createConsumer(queue); MessageProducer producer = producerSession.createProducer(queue)) {
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ consumerConnection.start();
+ final byte[] largeMessageContent = new byte[MESSAGE_SIZE];
+ final byte[] receivedContent = new byte[largeMessageContent.length];
+ ThreadLocalRandom.current().nextBytes(largeMessageContent);
+ for (int i = 0; i < MESSAGES; i++) {
+ final BytesMessage sentMessage = producerSession.createBytesMessage();
+ sentMessage.writeBytes(largeMessageContent);
+ producer.send(sentMessage);
+ final Message receivedMessage = consumer.receive(RECEIVE_TIMEOUT_MILLIS);
+ Assert.assertNotNull("A message should be received in " + RECEIVE_TIMEOUT_MILLIS + " ms", receivedMessage);
+ Assert.assertThat(receivedMessage, IsInstanceOf.instanceOf(sentMessage.getClass()));
+ Assert.assertEquals(largeMessageContent.length, ((BytesMessage) receivedMessage).readBytes(receivedContent));
+ Assert.assertArrayEquals(largeMessageContent, receivedContent);
+ }
+ }
+ }
+ }
+
+ protected void setupCluster(final MessageLoadBalancingType messageLoadBalancingType) throws Exception {
+ setupClusterConnection("cluster0", "queues", messageLoadBalancingType, 1, isNetty(), 0, 1);
+ setupClusterConnection("cluster1", "queues", messageLoadBalancingType, 1, isNetty(), 1, 0);
+ }
+
+ protected void setRedistributionDelay(final long delay) {
+ AddressSettings as = new AddressSettings().setRedistributionDelay(delay);
+
+ getServer(0).getAddressSettingsRepository().addMatch("queues.*", as);
+ getServer(1).getAddressSettingsRepository().addMatch("queues.*", as);
+ }
+
+ protected void setupServers() throws Exception {
+ setupServer(0, persistenceEnabled, isNetty());
+ setupServer(1, persistenceEnabled, isNetty());
+
+ servers[0].addProtocolManagerFactory(new ProtonProtocolManagerFactory());
+ servers[1].addProtocolManagerFactory(new ProtonProtocolManagerFactory());
+ }
+
+ protected void stopServers() throws Exception {
+ closeAllConsumers();
+
+ closeAllSessionFactories();
+
+ closeAllServerLocatorsFactories();
+
+ stopServers(0, 1);
+
+ clearServer(0, 1);
+ }
+
+}
+