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/01/23 21:27:29 UTC
[1/2] activemq-artemis git commit: This closes #1807
Repository: activemq-artemis
Updated Branches:
refs/heads/master dafcbb70a -> 434841b14
This closes #1807
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/434841b1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/434841b1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/434841b1
Branch: refs/heads/master
Commit: 434841b14fe126fd8e4befa3ddfc9f483545d7ff
Parents: dafcbb7 8b6df5b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jan 23 16:26:45 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jan 23 16:26:45 2018 -0500
----------------------------------------------------------------------
.../artemis/core/postoffice/AddressManager.java | 2 +
.../artemis/core/postoffice/PostOffice.java | 2 +
.../core/postoffice/impl/PostOfficeImpl.java | 7 ++-
.../postoffice/impl/SimpleAddressManager.java | 15 ++++-
.../postoffice/impl/WildcardAddressManager.java | 2 +
.../jms/consumer/JmsConsumerTest.java | 50 +++++++++++++++-
.../impl/WildcardAddressManagerUnitTest.java | 60 ++++++++++++++++++++
.../core/server/impl/fakes/FakePostOffice.java | 6 ++
8 files changed, 140 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1627 - Support removing
addresses that do not have direct bindings
Posted by cl...@apache.org.
ARTEMIS-1627 - Support removing addresses that do not have direct
bindings
If there are no direct bindings on an address and only linked bindings
then the address should be able to be removed from the broker
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8b6df5b7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8b6df5b7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8b6df5b7
Branch: refs/heads/master
Commit: 8b6df5b73a6e2a028033212bdf89c5f2512346b6
Parents: dafcbb7
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Tue Jan 23 07:46:33 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jan 23 16:26:45 2018 -0500
----------------------------------------------------------------------
.../artemis/core/postoffice/AddressManager.java | 2 +
.../artemis/core/postoffice/PostOffice.java | 2 +
.../core/postoffice/impl/PostOfficeImpl.java | 7 ++-
.../postoffice/impl/SimpleAddressManager.java | 15 ++++-
.../postoffice/impl/WildcardAddressManager.java | 2 +
.../jms/consumer/JmsConsumerTest.java | 50 +++++++++++++++-
.../impl/WildcardAddressManagerUnitTest.java | 60 ++++++++++++++++++++
.../core/server/impl/fakes/FakePostOffice.java | 6 ++
8 files changed, 140 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
index dbf1ef7..858754d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
@@ -46,6 +46,8 @@ public interface AddressManager {
Bindings getMatchingBindings(SimpleString address) throws Exception;
+ Bindings getDirectBindings(SimpleString address) throws Exception;
+
SimpleString getMatchingQueue(SimpleString address, RoutingType routingType) throws Exception;
SimpleString getMatchingQueue(SimpleString address, SimpleString queueName, RoutingType routingType) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
index d015eda..2a8764e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
@@ -94,6 +94,8 @@ public interface PostOffice extends ActiveMQComponent {
Bindings getMatchingBindings(SimpleString address) throws Exception;
+ Bindings getDirectBindings(SimpleString address) throws Exception;
+
Map<SimpleString, Binding> getAllBindings();
SimpleString getMatchingQueue(SimpleString address, RoutingType routingType) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 13ef901..b0d37d1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -532,7 +532,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
public AddressInfo removeAddressInfo(SimpleString address) throws Exception {
synchronized (addressLock) {
server.callBrokerPlugins(server.hasBrokerPlugins() ? plugin -> plugin.beforeRemoveAddress(address) : null);
- Bindings bindingsForAddress = getBindingsForAddress(address);
+ final Bindings bindingsForAddress = getDirectBindings(address);
if (bindingsForAddress.getBindings().size() > 0) {
throw ActiveMQMessageBundle.BUNDLE.addressHasBindings(address);
}
@@ -702,6 +702,11 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
}
@Override
+ public Bindings getDirectBindings(final SimpleString address) throws Exception {
+ return addressManager.getDirectBindings(address);
+ }
+
+ @Override
public Map<SimpleString, Binding> getAllBindings() {
return addressManager.getBindings();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 72f6692..054b536 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -55,7 +55,7 @@ public class SimpleAddressManager implements AddressManager {
/**
* HashMap<Address, Binding>
*/
- private final ConcurrentMap<SimpleString, Bindings> mappings = new ConcurrentHashMap<>();
+ protected final ConcurrentMap<SimpleString, Bindings> mappings = new ConcurrentHashMap<>();
/**
* HashMap<QueueName, Binding>
@@ -137,6 +137,19 @@ public class SimpleAddressManager implements AddressManager {
}
@Override
+ public Bindings getDirectBindings(final SimpleString address) throws Exception {
+ Bindings bindings = bindingsFactory.createBindings(address);
+
+ for (Binding binding : nameMap.values()) {
+ if (binding.getAddress().equals(address)) {
+ bindings.addBinding(binding);
+ }
+ }
+
+ return bindings;
+ }
+
+ @Override
public SimpleString getMatchingQueue(final SimpleString address, RoutingType routingType) throws Exception {
Binding binding = getBinding(address);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
index 190ae69..eb242f3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
@@ -133,6 +133,8 @@ public class WildcardAddressManager extends SimpleAddressManager {
public AddressInfo removeAddressInfo(SimpleString address) throws Exception {
final AddressInfo removed = super.removeAddressInfo(address);
if (removed != null) {
+ //Remove from mappings so removeAndUpdateAddressMap processes and cleanup
+ mappings.remove(address);
removeAndUpdateAddressMap(new AddressImpl(removed.getName(), wildcardConfiguration));
}
return removed;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
index d0250b9..c4fd897 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.activemq.artemis.tests.integration.jms.consumer;
+import java.util.Enumeration;
+import java.util.concurrent.atomic.AtomicInteger;
+
import javax.jms.Connection;
import javax.jms.JMSConsumer;
import javax.jms.JMSContext;
@@ -28,8 +31,6 @@ import javax.jms.MessageProducer;
import javax.jms.QueueBrowser;
import javax.jms.Session;
import javax.jms.TextMessage;
-import java.util.Enumeration;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -888,4 +889,49 @@ public class JmsConsumerTest extends JMSTestBase {
sess.createConsumer(sess.createTopic(topic2));
sess.close();
}
+
+ /**
+ * ARTEMIS-1627 - Verify that a address can be removed when there are no direct
+ * bindings on the address but does have bindings on a linked address
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testAddressRemovalWithWildcardConsumer() throws Exception {
+ testAddressRemovalWithWithConsumers("durable.#", "durable.test");
+ }
+
+ @Test
+ public void testAddressRemovalWithNonWildcardConsumer() throws Exception {
+ testAddressRemovalWithWithConsumers("durable.test", "durable.#");
+ }
+
+ private void testAddressRemovalWithWithConsumers(String topic1, String topic2) throws Exception {
+ server.addAddressInfo(new AddressInfo(SimpleString.toSimpleString(topic1), RoutingType.MULTICAST));
+ server.addAddressInfo(new AddressInfo(SimpleString.toSimpleString(topic2), RoutingType.MULTICAST));
+
+ conn = cf.createConnection();
+ conn.setClientID("clientId");
+ conn.start();
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer c1 = sess.createDurableConsumer(sess.createTopic(topic1), "sub1");
+ c1.close();
+
+ // Make sure topic2 address can be removed and the bindings still exist for topic1
+ server.removeAddressInfo(SimpleString.toSimpleString(topic2), null);
+ assertEquals(1, server.getPostOffice().getBindingsForAddress(SimpleString.toSimpleString(topic1))
+ .getBindings().size());
+
+ // Re-create address by creating a consumer on the topic and make sure the
+ // wildcard and the direct consumer still receive the messages
+ c1 = sess.createDurableConsumer(sess.createTopic(topic1), "sub1");
+ MessageConsumer c2 = sess.createDurableConsumer(sess.createTopic(topic2), "sub2");
+ MessageProducer p1 = sess.createProducer(sess.createTopic("durable.test"));
+ p1.send(sess.createTextMessage("test"));
+
+ assertNotNull(c1.receive(1000));
+ assertNotNull(c2.receive(1000));
+ sess.close();
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index ef0d673..1c13cbd 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
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.core.config.WildcardConfiguration;
import org.apache.activemq.artemis.core.filter.Filter;
import org.apache.activemq.artemis.core.postoffice.Address;
import org.apache.activemq.artemis.core.postoffice.Binding;
@@ -135,6 +136,65 @@ public class WildcardAddressManagerUnitTest extends ActiveMQTestBase {
assertNull(wildcardAddresses.get(SimpleString.toSimpleString("Topic1.#")));
}
+ @Test
+ public void testWildCardAddressRemovalDifferentWildcard() throws Exception {
+
+ final WildcardConfiguration configuration = new WildcardConfiguration();
+ configuration.setAnyWords('>');
+ WildcardAddressManager ad = new WildcardAddressManager(new BindingFactoryFake(), configuration, null);
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.>"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.test"), RoutingType.MULTICAST));
+ ad.addBinding(new BindingFake("Topic1.>", "one"));
+
+ assertEquals(1, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.>")).getBindings().size());
+ assertEquals(1, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.test")).getBindings().size());
+ assertEquals(0, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.test")).getBindings().size());
+ assertEquals(1, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.>")).getBindings().size());
+
+ //Remove the address
+ ad.removeAddressInfo(SimpleString.toSimpleString("Topic1.test"));
+
+ //should still have 1 address and binding
+ assertEquals(1, ad.getAddresses().size());
+ assertEquals(1, ad.getBindings().size());
+
+ ad.removeBinding(SimpleString.toSimpleString("one"), null);
+ ad.removeAddressInfo(SimpleString.toSimpleString("Topic1.>"));
+
+ assertEquals(0, ad.getAddresses().size());
+ assertEquals(0, ad.getBindings().size());
+ }
+
+ @Test
+ public void testWildCardAddressDirectBindings() throws Exception {
+
+ final WildcardConfiguration configuration = new WildcardConfiguration();
+ configuration.setAnyWords('>');
+ WildcardAddressManager ad = new WildcardAddressManager(new BindingFactoryFake(), configuration, null);
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.>"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.test"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.test.test1"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic1.test.test2"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic2.>"), RoutingType.MULTICAST));
+ ad.addAddressInfo(new AddressInfo(SimpleString.toSimpleString("Topic2.test"), RoutingType.MULTICAST));
+ ad.addBinding(new BindingFake("Topic1.>", "one"));
+ ad.addBinding(new BindingFake("Topic1.test", "two"));
+ ad.addBinding(new BindingFake("Topic2.test", "three"));
+
+ assertEquals(1, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.>")).getBindings().size());
+ assertEquals(2, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.test")).getBindings().size());
+ assertEquals(1, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.test.test1")).getBindings().size());
+ assertEquals(1, ad.getBindingsForRoutingAddress(SimpleString.toSimpleString("Topic1.test.test2")).getBindings().size());
+
+ assertEquals(1, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.>")).getBindings().size());
+ assertEquals(1, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.test")).getBindings().size());
+ assertEquals(0, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.test1")).getBindings().size());
+ assertEquals(0, ad.getDirectBindings(SimpleString.toSimpleString("Topic1.test2")).getBindings().size());
+ assertEquals(0, ad.getDirectBindings(SimpleString.toSimpleString("Topic2.>")).getBindings().size());
+ assertEquals(1, ad.getDirectBindings(SimpleString.toSimpleString("Topic2.test")).getBindings().size());
+
+ }
+
class BindingFactoryFake implements BindingsFactory {
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8b6df5b7/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index 1674df5..98a7359 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -148,6 +148,12 @@ public class FakePostOffice implements PostOffice {
}
@Override
+ public Bindings getDirectBindings(final SimpleString address) {
+
+ return null;
+ }
+
+ @Override
public Object getNotificationLock() {
return null;