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 2023/10/05 18:05:45 UTC
[activemq-artemis] branch main updated (ef5fb0b1f1 -> 42be518deb)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from ef5fb0b1f1 ARTEMIS-4451: fix non-SASL AMQP connections when resource audit logging enabled
new 4db39520f2 ARTEMIS-4450 - Auto-deleted clustered destinations can cause message loss
new 42be518deb ARTEMIS-4450 Caching hasLocal boolean on bindings to avoid transversing the maps on every call
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../activemq/artemis/core/postoffice/Bindings.java | 4 +-
.../artemis/core/postoffice/impl/BindingsImpl.java | 34 +++--
.../core/postoffice/impl/PostOfficeImpl.java | 2 +-
.../core/server/impl/ServerSessionImpl.java | 3 +-
.../AutoDeleteClusteredDestinationTest.java | 150 +++++++++++++++++++++
.../impl/WildcardAddressManagerUnitTest.java | 5 +
6 files changed, 181 insertions(+), 17 deletions(-)
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteClusteredDestinationTest.java
[activemq-artemis] 02/02: ARTEMIS-4450 Caching hasLocal boolean on bindings to avoid transversing the maps on every call
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 42be518deb538ad67c8b12afb70ea12144b6f4a0
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Oct 5 11:43:35 2023 -0400
ARTEMIS-4450 Caching hasLocal boolean on bindings to avoid transversing the maps on every call
---
.../activemq/artemis/core/postoffice/Bindings.java | 4 +--
.../artemis/core/postoffice/impl/BindingsImpl.java | 34 +++++++++++++++-------
.../core/postoffice/impl/PostOfficeImpl.java | 2 +-
.../core/server/impl/ServerSessionImpl.java | 3 +-
.../impl/WildcardAddressManagerUnitTest.java | 5 ++++
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
index 21d37ec02f..07b3f45768 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
@@ -63,7 +63,5 @@ public interface Bindings extends UnproposalListener {
int size();
- default boolean contains(Class clazz) {
- return false;
- }
+ boolean hasLocalBinding();
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
index a1339a1a77..e3bd6feefb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
@@ -52,6 +52,7 @@ import org.apache.activemq.artemis.utils.CompositeAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.function.BiConsumer;
public final class BindingsImpl implements Bindings {
@@ -86,7 +87,12 @@ public final class BindingsImpl implements Bindings {
/**
* This has a version about adds and removes
*/
- private final AtomicInteger version = new AtomicInteger(sequenceVersion.incrementAndGet());
+ private volatile int version;
+
+ private static final AtomicIntegerFieldUpdater<BindingsImpl> VERSION_UPDATER = AtomicIntegerFieldUpdater
+ .newUpdater(BindingsImpl.class, "version");
+
+ private volatile boolean hasLocal;
public BindingsImpl(final SimpleString name, final GroupingHandler groupingHandler, StorageManager storageManager) {
this.groupingHandler = groupingHandler;
@@ -157,7 +163,19 @@ public final class BindingsImpl implements Bindings {
}
private void updated() {
- version.set(sequenceVersion.incrementAndGet());
+ VERSION_UPDATER.set(this, sequenceVersion.incrementAndGet());
+ checkBindingsIdMap();
+ }
+
+ private void checkBinding(Long bindingID, Binding binding) {
+ if (binding instanceof LocalQueueBinding) {
+ hasLocal = true;
+ }
+ }
+
+ private void checkBindingsIdMap() {
+ hasLocal = false;
+ bindingsIdMap.forEach(this::checkBinding);
}
@Override
@@ -201,14 +219,8 @@ public final class BindingsImpl implements Bindings {
}
@Override
- public boolean contains(Class clazz) {
- for (Binding binding : getBindings()) {
- if (clazz.isInstance(binding)) {
- return true;
- }
- }
-
- return false;
+ public boolean hasLocalBinding() {
+ return hasLocal;
}
@@ -296,7 +308,7 @@ public final class BindingsImpl implements Bindings {
private void route(final Message message,
final RoutingContext context,
final boolean groupRouting) throws Exception {
- final int currentVersion = version.get();
+ final int currentVersion = VERSION_UPDATER.get(this);
final boolean reusableContext = context.isReusable(message, currentVersion);
if (!reusableContext) {
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 f5d6f0ad23..0296594994 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
@@ -1269,7 +1269,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
Bindings simpleRoute(SimpleString address, RoutingContext context, Message message, AddressInfo addressInfo) throws Exception {
Bindings bindings = addressManager.getBindingsForRoutingAddress(address);
- if ((bindings == null || !bindings.contains(LocalQueueBinding.class)) && context.getServerSession() != null) {
+ if ((bindings == null || !bindings.hasLocalBinding()) && context.getServerSession() != null) {
AutoCreateResult autoCreateResult = context.getServerSession().checkAutoCreate(new QueueConfiguration(address).setRoutingType(context.getRoutingType()));
if (autoCreateResult == AutoCreateResult.NOT_FOUND) {
ActiveMQException e = ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(address);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 5b80fcb5b3..d665492d8e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -64,7 +64,6 @@ import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
import org.apache.activemq.artemis.core.postoffice.QueueBinding;
import org.apache.activemq.artemis.core.postoffice.RoutingStatus;
-import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
import org.apache.activemq.artemis.core.remoting.CertificateUtil;
import org.apache.activemq.artemis.core.remoting.CloseListener;
@@ -1826,7 +1825,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
if (server.locateQueue(unPrefixedQueue) == null) {
// The queue doesn't exist.
Bindings bindings = server.getPostOffice().lookupBindingsForAddress(unPrefixedAddress);
- if (bindings != null && bindings.contains(LocalQueueBinding.class) && !queueConfig.isFqqn()) {
+ if (bindings != null && bindings.hasLocalBinding() && !queueConfig.isFqqn()) {
// The address has another queue with a different name, which is fine. Just ignore it.
result = AutoCreateResult.EXISTED;
} else if (addressSettings.isAutoCreateQueues() || queueConfig.isTemporary()) {
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 a2eace09f5..910704a882 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
@@ -493,6 +493,11 @@ public class WildcardAddressManagerUnitTest extends ActiveMQTestBase {
this.name = address;
}
+ @Override
+ public boolean hasLocalBinding() {
+ return false;
+ }
+
@Override
public Collection<Binding> getBindings() {
return bindings.values();
[activemq-artemis] 01/02: ARTEMIS-4450 - Auto-deleted clustered destinations can cause message loss
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4db39520f253eabf3eae408fdf5a00a6944f4bd9
Author: a181321 <an...@volvo.com>
AuthorDate: Wed Oct 4 13:44:37 2023 +0200
ARTEMIS-4450 - Auto-deleted clustered destinations can cause message loss
---
.../core/postoffice/impl/PostOfficeImpl.java | 2 +-
.../AutoDeleteClusteredDestinationTest.java | 150 +++++++++++++++++++++
2 files changed, 151 insertions(+), 1 deletion(-)
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 bb6502605d..f5d6f0ad23 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
@@ -1269,7 +1269,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
Bindings simpleRoute(SimpleString address, RoutingContext context, Message message, AddressInfo addressInfo) throws Exception {
Bindings bindings = addressManager.getBindingsForRoutingAddress(address);
- if (bindings == null && context.getServerSession() != null) {
+ if ((bindings == null || !bindings.contains(LocalQueueBinding.class)) && context.getServerSession() != null) {
AutoCreateResult autoCreateResult = context.getServerSession().checkAutoCreate(new QueueConfiguration(address).setRoutingType(context.getRoutingType()));
if (autoCreateResult == AutoCreateResult.NOT_FOUND) {
ActiveMQException e = ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(address);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteClusteredDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteClusteredDestinationTest.java
new file mode 100644
index 0000000000..8c6898cffa
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteClusteredDestinationTest.java
@@ -0,0 +1,150 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
+import org.apache.activemq.artemis.core.server.impl.QueueManagerImpl;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.Wait;
+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 AutoDeleteClusteredDestinationTest extends ClusterTestBase {
+
+ @Parameterized.Parameter(0)
+ public MessageLoadBalancingType loadBalancingType = MessageLoadBalancingType.OFF;
+
+ @Parameterized.Parameters(name = "loadBalancingType = {0}")
+ public static Iterable<? extends Object> loadBalancingType() {
+ return Arrays.asList(new Object[][]{
+ {MessageLoadBalancingType.OFF},
+ {MessageLoadBalancingType.STRICT},
+ {MessageLoadBalancingType.ON_DEMAND},
+ {MessageLoadBalancingType.OFF_WITH_REDISTRIBUTION}});
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ setupServer(0, isFileStorage(), isNetty());
+ setupServer(1, isFileStorage(), isNetty());
+ }
+
+ @Test
+ public void testConnectionLoadBalancingAnonRun() throws Exception {
+ final String queueName = "queue";
+ final String url0 = "tcp://localhost:61616?useTopologyForLoadBalancing=false";
+ final String url1 = "tcp://localhost:61617?useTopologyForLoadBalancing=false";
+ final SimpleString simpleName = SimpleString.toSimpleString(queueName);
+ final int messageCount = 10;
+ final int TIMEOUT = 5000;
+
+ CountDownLatch latch = new CountDownLatch(messageCount);
+
+ MessageListener listener0 = message -> {
+ latch.countDown();
+ };
+
+ MessageListener listener1 = message -> {
+ latch.countDown();
+ };
+
+ setupClusterConnection("cluster0", queueName, loadBalancingType, 1, isNetty(), 0, 1);
+ setupClusterConnection("cluster1", queueName, loadBalancingType, 1, isNetty(), 1, 0);
+
+ startServers(0, 1);
+ waitForServerToStart(servers[0]);
+ waitForServerToStart(servers[1]);
+
+ AddressSettings settings = new AddressSettings().setRedistributionDelay(0).setAutoCreateAddresses(true).setAutoCreateQueues(true).setAutoDeleteQueues(true);
+
+ servers[0].getAddressSettingsRepository().addMatch(queueName, settings);
+ servers[1].getAddressSettingsRepository().addMatch(queueName, settings);
+
+ try (
+ ActiveMQConnectionFactory connectionFactory0 = new ActiveMQConnectionFactory(url0);
+ ActiveMQConnectionFactory connectionFactory1 = new ActiveMQConnectionFactory(url1);
+ Connection connection0 = connectionFactory0.createConnection();
+ Connection connection1 = connectionFactory1.createConnection();
+ Session consumerSession0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session consumerSession1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session producerSession0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE)) {
+
+ Queue queue = consumerSession0.createQueue(queueName);
+ MessageProducer producer0 = producerSession0.createProducer(queue);
+ MessageConsumer consumer0 = consumerSession0.createConsumer(queue);
+ MessageConsumer consumer1 = consumerSession1.createConsumer(queue);
+
+ consumer0.setMessageListener(listener0);
+ consumer1.setMessageListener(listener1);
+ connection0.start();
+ connection1.start();
+
+ for (int i = 0; i < messageCount; i++) {
+ producer0.send(producerSession0.createTextMessage("Message"));
+
+ if (i == 2) {
+ QueueImpl serverQueue = (QueueImpl) servers[0].locateQueue(simpleName);
+ Wait.assertTrue(() -> serverQueue.getMessageCount() == 0, TIMEOUT, 100);
+ consumer0.close();
+ //Trigger an auto-delete to not have to wait
+ QueueManagerImpl.performAutoDeleteQueue(servers[0], serverQueue);
+ Wait.assertTrue(() -> servers[0].getPostOffice().getAddressInfo(simpleName).getBindingRemovedTimestamp() != -1, TIMEOUT, 100);
+ }
+
+ if (i == 6) {
+ consumer0 = consumerSession0.createConsumer(queue);
+ consumer0.setMessageListener(listener0);
+ QueueImpl serverQueue = (QueueImpl) servers[0].locateQueue(simpleName);
+ Wait.assertTrue(() -> serverQueue.getConsumerCount() == 1, TIMEOUT, 100);
+ }
+ }
+
+ Assert.assertTrue(latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+
+ }
+ }
+
+ protected boolean isNetty() {
+ return true;
+ }
+
+ @Override
+ protected boolean isFileStorage() {
+ return false;
+ }
+
+}