You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2023/12/21 17:43:42 UTC

(activemq-artemis) branch main updated: ARTEMIS-4521 deleting divert using mngmnt API doesn't remove binding from journal

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new d4d4b06fc7 ARTEMIS-4521 deleting divert using mngmnt API doesn't remove binding from journal
d4d4b06fc7 is described below

commit d4d4b06fc72e153e010b8c75d8311b3ef2c141e3
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Thu Nov 30 13:12:49 2023 -0600

    ARTEMIS-4521 deleting divert using mngmnt API doesn't remove binding from journal
---
 .../management/impl/ActiveMQServerControlImpl.java |  2 +-
 .../core/postoffice/impl/PostOfficeImpl.java       |  2 +-
 .../artemis/core/server/ActiveMQServer.java        |  2 ++
 .../core/server/impl/ActiveMQServerImpl.java       |  9 +++++++
 .../management/ActiveMQServerControlTest.java      | 28 ++++++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 6a72d233dd..6c4dba49af 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -3722,7 +3722,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
 
       clearIO();
       try {
-         server.destroyDivert(SimpleString.toSimpleString(name));
+         server.destroyDivert(SimpleString.toSimpleString(name), true);
       } finally {
          blockOnIO();
       }
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 0296594994..92eb2fadbc 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
@@ -637,7 +637,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
 
       SimpleString internalDivertName = ResourceNames.getRetroactiveResourceDivertName(prefix, delimiter, address);
       if (getBinding(internalDivertName) != null) {
-         server.destroyDivert(internalDivertName);
+         server.destroyDivert(internalDivertName, true);
       }
 
       SimpleString internalAnycastQueueName = ResourceNames.getRetroactiveResourceQueueName(prefix, delimiter, address, RoutingType.ANYCAST);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index f5cb578a4b..ae78ad3ae9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -732,6 +732,8 @@ public interface ActiveMQServer extends ServiceComponent {
 
    void destroyDivert(SimpleString name) throws Exception;
 
+   void destroyDivert(SimpleString name, boolean deleteFromStorage) throws Exception;
+
    ConnectorsService getConnectorsService();
 
    boolean deployBridge(BridgeConfiguration config) throws Exception;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index f18cf27e67..4b6c93cc41 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2970,6 +2970,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
    @Override
    public void destroyDivert(SimpleString name) throws Exception {
+      destroyDivert(name, false);
+   }
+
+   @Override
+   public void destroyDivert(SimpleString name, boolean deleteFromStorage) throws Exception {
       Binding binding = postOffice.getBinding(name);
       if (binding == null) {
          throw ActiveMQMessageBundle.BUNDLE.noBindingForDivert(name);
@@ -2983,6 +2988,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       if (((DivertBinding)binding).getDivert().getTransformer() != null) {
          getServiceRegistry().removeDivertTransformer(name.toString());
       }
+
+      if (deleteFromStorage) {
+         storageManager.deleteDivertConfiguration(name.toString());
+      }
    }
 
    @Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index eb00959ac9..356e4be1d3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -1733,6 +1733,34 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
 
    }
 
+   @Test
+   public void testCreateAndDestroyDivertServerRestart() throws Exception {
+      String address = RandomUtil.randomString();
+      String name = RandomUtil.randomString();
+
+      ActiveMQServerControl serverControl = createManagementControl();
+
+      checkNoResource(ObjectNameBuilder.DEFAULT.getDivertObjectName(name, address));
+      assertEquals(0, serverControl.getDivertNames().length);
+
+      serverControl.createDivert(name.toString(), RandomUtil.randomString(), address, RandomUtil.randomString(), true, null, null);
+
+      checkResource(ObjectNameBuilder.DEFAULT.getDivertObjectName(name, address));
+      assertEquals(1, serverControl.getDivertNames().length);
+
+      serverControl.destroyDivert(name.toString());
+
+      checkNoResource(ObjectNameBuilder.DEFAULT.getDivertObjectName(name, address));
+      assertEquals(0, serverControl.getDivertNames().length);
+
+      server.stop();
+
+      server.start();
+
+      checkNoResource(ObjectNameBuilder.DEFAULT.getDivertObjectName(name, address));
+      assertEquals(0, serverControl.getDivertNames().length);
+   }
+
    @Test
    public void testCreateAndUpdateDivert() throws Exception {
       String address = RandomUtil.randomString();