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

This closes #2993

This commit is contained in:
Clebert Suconic 2020-03-05 21:36:35 -05:00
parent 32829d6542 339ccccbd7
commit e899fac372
4 changed files with 52 additions and 4 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

@ -269,7 +269,7 @@ public class SimpleAddressManager implements AddressManager {
@Override
public boolean addAddressInfo(AddressInfo addressInfo) throws Exception {
boolean added = reloadAddressInfo(addressInfo);
if (added && storageManager != null) {
if (!addressInfo.isTemporary() && added && storageManager != null) {
long txID = storageManager.generateID();
try {
storageManager.addAddressBinding(txID, addressInfo);

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -3382,9 +3382,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
RoutingType rt = (routingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : routingType);
if (autoCreateAddress || temporary) {
if (info == null) {
final AddressInfo addressInfo = new AddressInfo(addressToUse, rt);
addressInfo.setAutoCreated(true);
addressInfo.setInternal(addrInfo == null ? false : addrInfo.isInternal());
final AddressInfo addressInfo = new AddressInfo(addressToUse, rt)
.setAutoCreated(true)
.setTemporary(temporary)
.setInternal(addrInfo == null ? false : addrInfo.isInternal());
addAddressInfo(addressInfo);
} else if (!info.getRoutingTypes().contains(rt)) {
EnumSet<RoutingType> routingTypes = EnumSet.copyOf(info.getRoutingTypes());

11
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
View File

@ -46,6 +46,8 @@ public class AddressInfo {
private boolean autoCreated = false;
private volatile boolean temporary = false;
private static final EnumSet<RoutingType> EMPTY_ROUTING_TYPES = EnumSet.noneOf(RoutingType.class);
private EnumSet<RoutingType> routingTypes;
private RoutingType firstSeen;
@ -101,6 +103,15 @@ public class AddressInfo {
return this;
}
public boolean isTemporary() {
return temporary;
}
public AddressInfo setTemporary(boolean temporary) {
this.temporary = temporary;
return this;
}
public SimpleString getName() {
return name;
}

36
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TemporaryDestinationTest.java
View File

@ -47,6 +47,11 @@ public class TemporaryDestinationTest extends JMSTestBase {
super.setUp();
}
@Override
protected boolean usePersistence() {
return true;
}
@Test
public void testTemporaryQueueLeak() throws Exception {
ActiveMQConnection conn = null;
@ -213,6 +218,37 @@ public class TemporaryDestinationTest extends JMSTestBase {
}
}
@Test
public void testTemporaryResourcesDeletedAfterServerRestart() throws Exception {
server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false).setAutoCreateQueues(false));
Connection conn = null;
try {
conn = createConnection();
Session producerSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
TemporaryQueue tempQueue = producerSession.createTemporaryQueue();
assertNotNull(server.getAddressInfo(SimpleString.toSimpleString(tempQueue.getQueueName())));
server.stop();
conn.close();
server.start();
waitForServerToStart(server);
assertNull(server.getAddressInfo(SimpleString.toSimpleString(tempQueue.getQueueName())));
} finally {
if (conn != null) {
conn.close();
}
}
}
@Test
public void testForTempQueueCleanerUpperLeak() throws Exception {
try {