Skip to content

ARTEMIS-1612 Fix message redistribution for prefixed addresses #1782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mtaylor wants to merge 1 commit into from
Closed

ARTEMIS-1612 Fix message redistribution for prefixed addresses #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ public Pair<RoutingContext, Message> redistribute(final Message message,
// as described on https://issues.jboss.org/browse/JBPAPP-6130
Message copyRedistribute = message.copy(storageManager.generateID());

Bindings bindings = addressManager.getBindingsForRoutingAddress(message.getAddressSimpleString());
Bindings bindings = addressManager.getBindingsForRoutingAddress(originatingQueue.getAddress());
Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic Jan 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!!! easy and simple fix!!!!


if (bindings != null) {
RoutingContext context = new RoutingContextImpl(tx);
Expand Down
2 changes: 1 addition & 1 deletion artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ protected static final TransportConfiguration createTransportConfiguration(boole
}
if (params == null)
params = new HashMap<>();
return new TransportConfiguration(className, params);
return new TransportConfiguration(className, params, UUIDGenerator.getInstance().generateStringUUID(), new HashMap<String, Object>());
}

protected void waitForServerToStart(ActiveMQServer server) throws InterruptedException {
Expand Down
48 changes: 48 additions & 0 deletions ...he/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
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.ClientProducer;
import org.apache.activemq.artemis.api.core.client.ClientSession;

import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.Bindable;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
Expand Down Expand Up @@ -651,6 +653,52 @@ public void testRedistributionWhenConsumerIsClosedConsumersWithFilters() throws
verifyReceiveRoundRobinInSomeOrderWithCounts(false, ids0, 2);
}

@Test
public void testRedistributionWithPrefixesWhenRemoteConsumerIsAdded() throws Exception {

for (int i = 0; i <= 2; i++) {
ActiveMQServer server = getServer(i);
for (TransportConfiguration c : server.getConfiguration().getAcceptorConfigurations()) {
c.getExtraParams().putIfAbsent("anycastPrefix", "jms.queue.");
}
}

setupCluster(MessageLoadBalancingType.ON_DEMAND);

startServers(0, 1, 2);

setupSessionFactory(0, isNetty());
setupSessionFactory(1, isNetty());
setupSessionFactory(2, isNetty());

String name = "queues.queue";

createQueue(0, name, name, null, false, RoutingType.ANYCAST);
createQueue(1, name, name, null, false, RoutingType.ANYCAST);
createQueue(2, name, name, null, false, RoutingType.ANYCAST);

addConsumer(0, 0, name, null);

waitForBindings(0, name, 1, 1, true);
waitForBindings(1, name, 1, 0, true);
waitForBindings(2, name, 1, 0, true);

waitForBindings(0, name, 2, 0, false);
waitForBindings(1, name, 2, 1, false);
waitForBindings(2, name, 2, 1, false);

removeConsumer(0);

Thread.sleep(2000);

send(0, "jms.queue." + name, 20, false, null);

addConsumer(1, 1, name, null);

verifyReceiveAll(20, 1);
verifyNotReceive(1);
}

@Test
public void testRedistributionWhenRemoteConsumerIsAdded() throws Exception {
setupCluster(MessageLoadBalancingType.ON_DEMAND);
Expand Down