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 2020/06/30 00:44:04 UTC
[activemq-artemis] 02/03: ARTEMIS-2831 Avoiding
StackOverFlowException when setDLAOnNoRoute(true)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit f79a4be4c170d9692081a9a309dcf805f8bfa00c
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Jun 29 11:18:13 2020 -0400
ARTEMIS-2831 Avoiding StackOverFlowException when setDLAOnNoRoute(true)
---
.../core/postoffice/impl/PostOfficeImpl.java | 27 ++++++++-
.../integration/addressing/SendDLQNoRouteTest.java | 70 ++++++++++++++++++++++
2 files changed, 94 insertions(+), 3 deletions(-)
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 c50f421..9c1f56a 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
@@ -1033,7 +1033,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
public RoutingStatus route(final Message message,
final RoutingContext context,
final boolean direct) throws Exception {
- return route(message, context, direct, true, null);
+ return route(message, context, direct, true, null, false);
}
@Override
@@ -1043,6 +1043,21 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
boolean rejectDuplicates,
final Binding bindingMove) throws Exception {
+ return route(message, context, direct, rejectDuplicates, bindingMove, false);
+ }
+
+
+ /**
+ * The route can call itelf sending to DLA.
+ * if a DLA still not found, it should then use previous semantics.
+ * */
+ private RoutingStatus route(final Message message,
+ final RoutingContext context,
+ final boolean direct,
+ boolean rejectDuplicates,
+ final Binding bindingMove, boolean sendToDLA) throws Exception {
+
+
RoutingStatus result;
// Sanity check
if (message.getRefCount() > 0) {
@@ -1102,7 +1117,13 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
AddressSettings addressSettings = addressSettingsRepository.getMatch(address.toString());
- boolean sendToDLA = addressSettings.isSendToDLAOnNoRoute();
+
+ if (sendToDLA) {
+ // it's already been through here once, giving up now
+ sendToDLA = false;
+ } else {
+ sendToDLA = addressSettings.isSendToDLAOnNoRoute();
+ }
if (sendToDLA) {
// Send to the DLA for the address
@@ -1123,7 +1144,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
message.reencode();
- route(message, context.getTransaction(), false);
+ route(message, new RoutingContextImpl(context.getTransaction()), false, true, null, sendToDLA);
result = RoutingStatus.NO_BINDINGS_DLA;
}
} else {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/SendDLQNoRouteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/SendDLQNoRouteTest.java
new file mode 100644
index 0000000..396e9e3
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/SendDLQNoRouteTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.addressing;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SendDLQNoRouteTest extends ActiveMQTestBase {
+
+ private ActiveMQServer server;
+
+ private ClientSessionFactory sessionFactory;
+
+ @Before
+ public void setup() throws Exception {
+ server = createServer(true);
+ server.start();
+ }
+
+
+ @Test(timeout = 20_000)
+ public void testDLQNoRoute() throws Exception {
+ AddressSettings addressSettings = new AddressSettings().setSendToDLAOnNoRoute(true);
+ addressSettings.setDeadLetterAddress(SimpleString.toSimpleString("DLA"));
+ server.getAddressSettingsRepository().addMatch("#", addressSettings);
+
+ AddressInfo info = new AddressInfo(SimpleString.toSimpleString("info")).addRoutingType(RoutingType.MULTICAST);
+ server.addAddressInfo(info);
+
+ AddressInfo dla = new AddressInfo(SimpleString.toSimpleString("DLA")).addRoutingType(RoutingType.MULTICAST);
+ server.addAddressInfo(dla);
+
+
+ ServerLocator locator = createNonHALocator(false);
+
+ ClientSessionFactory factory = locator.createSessionFactory();
+ ClientSession session = factory.createSession(true, true);
+ ClientProducer producer = session.createProducer("info");
+
+ producer.send(session.createMessage(true));
+
+ session.commit();
+
+
+ }
+}