Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4563 Remove auto-created addresses upon restart

This commit is contained in:
Domenico Francesco Bruscino 2024-01-10 15:02:22 +01:00 committed by Robbie Gemmell
parent 8b2255d78d
commit a7f18777a3
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
View File

@ -371,7 +371,7 @@ public class SimpleAddressManager implements AddressManager {
public boolean checkAutoRemoveAddress(AddressInfo addressInfo, public boolean checkAutoRemoveAddress(AddressInfo addressInfo,
AddressSettings settings, AddressSettings settings,
boolean ignoreDelay) throws Exception { boolean ignoreDelay) throws Exception {
return settings.isAutoDeleteAddresses() && addressInfo != null && addressInfo.isAutoCreated() && !bindingsFactory.isAddressBound(addressInfo.getName()) && addressWasUsed(addressInfo, settings) && (ignoreDelay || delayCheck(addressInfo, settings)); return settings.isAutoDeleteAddresses() && addressInfo != null && addressInfo.isAutoCreated() && !bindingsFactory.isAddressBound(addressInfo.getName()) && (ignoreDelay || addressWasUsed(addressInfo, settings)) && (ignoreDelay || delayCheck(addressInfo, settings));
} }
private boolean delayCheck(AddressInfo addressInfo, AddressSettings settings) { private boolean delayCheck(AddressInfo addressInfo, AddressSettings settings) {

21
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateTest.java
View File

@ -353,7 +353,8 @@ public class AutoCreateTest extends ActiveMQTestBase {
server.getConfiguration().setAddressQueueScanPeriod(-1); // disabling scanner, we will perform it manually server.getConfiguration().setAddressQueueScanPeriod(-1); // disabling scanner, we will perform it manually
server.start(); server.start();
String QUEUE_NAME = getName(); String QUEUE_NAME = "QUEUE_" + getName();
String TOPIC_NAME = "TOPIC_" + getName();
ConnectionFactory cf = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); ConnectionFactory cf = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616");
try (Connection connection = cf.createConnection()) { try (Connection connection = cf.createConnection()) {
@ -381,26 +382,38 @@ public class AutoCreateTest extends ActiveMQTestBase {
try (Connection connection = cf.createConnection()) { try (Connection connection = cf.createConnection()) {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(QUEUE_NAME); Queue queue = session.createQueue(QUEUE_NAME);
MessageProducer producer = session.createProducer(queue); Topic topic = session.createTopic(TOPIC_NAME);
producer.send(session.createTextMessage(randomString)); MessageProducer producer = session.createProducer(null);
producer.send(queue, session.createTextMessage(randomString));
producer.send(topic, session.createTextMessage(randomString));
} }
info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(QUEUE_NAME)); info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(QUEUE_NAME));
Assert.assertNotNull(info); Assert.assertNotNull(info);
Assert.assertTrue(info.isAutoCreated()); Assert.assertTrue(info.isAutoCreated());
info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(TOPIC_NAME));
Assert.assertNotNull(info);
Assert.assertTrue(info.isAutoCreated());
server.stop(); server.stop();
try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) { try (AssertionLoggerHandler loggerHandler = new AssertionLoggerHandler()) {
server.start(); server.start();
Assert.assertFalse(loggerHandler.findText("AMQ224113")); // this time around the queue had messages, it has to exist // this time around the address QUEUE_NAME had a queue with messages, it has to exist
Assert.assertFalse(loggerHandler.matchText("AMQ224113.*" + QUEUE_NAME));
Assert.assertFalse(loggerHandler.findText("AMQ224112")); Assert.assertFalse(loggerHandler.findText("AMQ224112"));
// the address TOPIC_NAME had no queues, it has to be removed
Assert.assertTrue(loggerHandler.matchText("AMQ224113.*" + TOPIC_NAME));
} }
info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(QUEUE_NAME)); info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(QUEUE_NAME));
Assert.assertNotNull(info); Assert.assertNotNull(info);
Assert.assertTrue(info.isAutoCreated()); Assert.assertTrue(info.isAutoCreated());
info = server.getPostOffice().getAddressInfo(SimpleString.toSimpleString(TOPIC_NAME));
Assert.assertNull(info);
{ // just a namespace { // just a namespace
org.apache.activemq.artemis.core.server.Queue serverQueue = server.locateQueue(QUEUE_NAME); org.apache.activemq.artemis.core.server.Queue serverQueue = server.locateQueue(QUEUE_NAME);
Wait.assertEquals(1, serverQueue::getMessageCount); Wait.assertEquals(1, serverQueue::getMessageCount);