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 2017/11/21 14:49:45 UTC
[1/2] activemq-artemis git commit: This closes #1661
Repository: activemq-artemis
Updated Branches:
refs/heads/master b27ed5de1 -> accec57e5
This closes #1661
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/accec57e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/accec57e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/accec57e
Branch: refs/heads/master
Commit: accec57e566f41b6ae80f04d387a7eb428c8e756
Parents: b27ed5d 40aa3f5
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Nov 21 09:44:30 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Nov 21 09:44:30 2017 -0500
----------------------------------------------------------------------
.../protocol/amqp/broker/AMQPMessage.java | 8 ++++
.../core/server/cluster/impl/BridgeImpl.java | 11 ++++--
.../cluster/impl/ClusterConnectionBridge.java | 4 +-
.../integration/amqp/AmqpSendReceiveTest.java | 39 ++++++++++++++++++++
4 files changed, 57 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1513 fix AMQP + core bridge
Posted by cl...@apache.org.
ARTEMIS-1513 fix AMQP + core bridge
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/40aa3f58
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/40aa3f58
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/40aa3f58
Branch: refs/heads/master
Commit: 40aa3f582146c67ad30c0c1cf091205c45aa1a71
Parents: b27ed5d
Author: Justin Bertram <jb...@apache.org>
Authored: Mon Nov 20 09:30:52 2017 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Nov 21 09:44:30 2017 -0500
----------------------------------------------------------------------
.../protocol/amqp/broker/AMQPMessage.java | 8 ++++
.../core/server/cluster/impl/BridgeImpl.java | 11 ++++--
.../cluster/impl/ClusterConnectionBridge.java | 4 +-
.../integration/amqp/AmqpSendReceiveTest.java | 39 ++++++++++++++++++++
4 files changed, 57 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40aa3f58/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index d8b67ea..a03ff10 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -1131,4 +1131,12 @@ public class AMQPMessage extends RefCountMessage {
this.durable = true; // it's coming from the journal, so it's durable
parseHeaders();
}
+
+ @Override
+ public String toString() {
+ return "AMQPMessage [durable=" + isDurable() +
+ ", messageID=" + getMessageID() +
+ ", address=" + getAddress() +
+ "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40aa3f58/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 39a2b2d..3aa82a1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -511,7 +511,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
/* Hook for processing message before forwarding */
- protected Message beforeForward(final Message message) {
+ protected Message beforeForward(final Message message, final SimpleString forwardingAddress) {
if (useDuplicateDetection) {
// We keep our own DuplicateID for the Bridge, so bouncing back and forth will work fine
byte[] bytes = getDuplicateBytes(nodeUUID, message.getMessageID());
@@ -519,6 +519,11 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
message.putExtraBytesProperty(Message.HDR_BRIDGE_DUPLICATE_ID, bytes);
}
+ if (forwardingAddress != null) {
+ // for AMQP messages this modification will be transient
+ message.setAddress(forwardingAddress);
+ }
+
if (transformer != null) {
final Message transformedMessage = transformer.transform(message);
if (transformedMessage != message) {
@@ -568,8 +573,6 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
refs.put(ref.getMessage().getMessageID(), ref);
}
- final Message message = beforeForward(ref.getMessage());
-
final SimpleString dest;
if (forwardingAddress != null) {
@@ -579,6 +582,8 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
dest = ref.getMessage().getAddressSimpleString();
}
+ final Message message = beforeForward(ref.getMessage(), dest);
+
pendingAcks.countUp();
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40aa3f58/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index cf24d0f..5f70d28 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -150,7 +150,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
}
@Override
- protected Message beforeForward(final Message message) {
+ protected Message beforeForward(final Message message, final SimpleString forwardingAddress) {
// We make a copy of the message, then we strip out the unwanted routing id headers and leave
// only
// the one pertinent for the address node - this is important since different queues on different
@@ -182,7 +182,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
messageCopy.putExtraBytesProperty(Message.HDR_ROUTE_TO_IDS, queueIds);
- messageCopy = super.beforeForward(messageCopy);
+ messageCopy = super.beforeForward(messageCopy, null);
return messageCopy;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40aa3f58/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
index 24ca845..a35541c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.integration.amqp;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport;
@@ -38,6 +39,7 @@ import org.slf4j.LoggerFactory;
import javax.jms.Topic;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -113,6 +115,43 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport {
}
@Test(timeout = 60000)
+ public void testCoreBridge() throws Exception {
+ server.getRemotingService().createAcceptor("acceptor", "vm://0").start();
+ server.getConfiguration().addConnectorConfiguration("connector", "vm://0");
+ server.deployBridge(new BridgeConfiguration()
+ .setName(getTestName())
+ .setQueueName(getQueueName())
+ .setForwardingAddress(getQueueName(1))
+ .setConfirmationWindowSize(10)
+ .setStaticConnectors(Arrays.asList("connector")));
+ sendMessages(getQueueName(), 1);
+
+ AmqpClient client = createAmqpClient();
+ AmqpConnection connection = addConnection(client.connect());
+ AmqpSession session = connection.createSession();
+
+ AmqpReceiver receiver = session.createReceiver(getQueueName(1));
+
+ Queue queueView = getProxyToQueue(getQueueName());
+ assertEquals(1, queueView.getConsumerCount());
+ assertEquals(0, queueView.getMessageCount());
+
+ queueView = getProxyToQueue(getQueueName(1));
+ assertEquals(1, queueView.getConsumerCount());
+ assertEquals(1, queueView.getMessageCount());
+
+ receiver.flow(1);
+ AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
+ assertNotNull(message);
+ message.accept();
+ receiver.close();
+
+ assertEquals(0, queueView.getMessageCount());
+
+ connection.close();
+ }
+
+ @Test(timeout = 60000)
public void testMessageDurableFalse() throws Exception {
sendMessages(getQueueName(), 1, false);