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 2021/03/03 18:50:13 UTC
[activemq-artemis] branch master updated: ARTEMIS-3147 Fix auto
created addresses reload
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
The following commit(s) were added to refs/heads/master by this push:
new 5aa3a4b ARTEMIS-3147 Fix auto created addresses reload
new 86be982 This closes #3472
5aa3a4b is described below
commit 5aa3a4b6aae00bff6c9f380116b8b21c29094ee9
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Mon Mar 1 22:38:25 2021 +0100
ARTEMIS-3147 Fix auto created addresses reload
---
.../core/persistence/AddressBindingInfo.java | 2 +
.../codec/PersistentAddressBindingEncoding.java | 5 +++
.../core/server/impl/PostOfficeJournalLoader.java | 1 +
.../persistence/AddressInfoRestartTest.java | 50 ++++++++++++++++++++++
4 files changed, 58 insertions(+)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
index 54aa3d4..e56e286 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
@@ -28,6 +28,8 @@ public interface AddressBindingInfo {
SimpleString getName();
+ boolean getAutoCreated();
+
EnumSet<RoutingType> getRoutingTypes();
AddressStatusEncoding getAddressStatusEncoding();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
index 057fa27..e23c69d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
@@ -79,6 +79,11 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
}
@Override
+ public boolean getAutoCreated() {
+ return autoCreated;
+ }
+
+ @Override
public EnumSet<RoutingType> getRoutingTypes() {
return routingTypes;
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index d8035c5..af707d4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -186,6 +186,7 @@ public class PostOfficeJournalLoader implements JournalLoader {
for (AddressBindingInfo addressBindingInfo : addressBindingInfos) {
AddressInfo addressInfo = new AddressInfo(addressBindingInfo.getName()).setRoutingTypes(addressBindingInfo.getRoutingTypes());
addressInfo.setId(addressBindingInfo.getId());
+ addressInfo.setAutoCreated(addressBindingInfo.getAutoCreated());
if (addressBindingInfo.getAddressStatusEncoding() != null && addressBindingInfo.getAddressStatusEncoding().getStatus() == AddressQueueStatus.PAUSED) {
addressInfo.setStorageManager(storageManager);
addressInfo.setPostOffice(postOffice);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressInfoRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressInfoRestartTest.java
new file mode 100644
index 0000000..0f1ace0
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/AddressInfoRestartTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.persistence;
+
+import org.apache.activemq.artemis.api.core.QueueConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AddressInfoRestartTest extends ActiveMQTestBase {
+
+ @Test
+ public void testAddressInfoAutoCreatedAndRestart() throws Exception {
+ ActiveMQServer server = createServer(true);
+
+ server.start();
+
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queue = new SimpleString("test.queue");
+
+ server.createQueue(new QueueConfiguration(queue).setAddress(address));
+
+ AddressInfo addressInfo1 = server.getPostOffice().getAddressInfo(address);
+ Assert.assertTrue(addressInfo1.isAutoCreated());
+
+ server.stop();
+
+ server.start();
+
+ AddressInfo addressInfo2 = server.getPostOffice().getAddressInfo(address);
+ Assert.assertTrue(addressInfo2.isAutoCreated());
+ }
+}