activemq-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From michaelandrepearce <...@git.apache.org>
Subject [GitHub] activemq-artemis pull request #1345: ARTEMIS-1235 Support queue and address ...
Date Wed, 21 Jun 2017 18:37:56 GMT
Github user michaelandrepearce commented on a diff in the pull request:

    https://github.com/apache/activemq-artemis/pull/1345#discussion_r123332025
  
    --- Diff: artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
---
    @@ -2313,6 +2318,53 @@ private void deploySecurityFromConfiguration() {
           }
        }
     
    +   private void undeployAddressesAndQueueNotInConfiguration() throws Exception {
    +      undeployAddressesAndQueueNotInConfiguration(configuration);
    +   }
    +
    +   private void undeployAddressesAndQueueNotInConfiguration(Configuration configuration)
throws Exception {
    +      Set<String> addressesInConfig = configuration.getAddressConfigurations().stream()
    +                                                   .map(CoreAddressConfiguration::getName)
    +                                                   .collect(Collectors.toSet());
    +
    +      Set<String> queuesInConfig = configuration.getAddressConfigurations().stream()
    +                                                .map(CoreAddressConfiguration::getQueueConfigurations)
    +                                                .flatMap(List::stream).map(CoreQueueConfiguration::getName)
    +                                                .collect(Collectors.toSet());
    +
    +      for (SimpleString addressName : listAddressNames()) {
    +         AddressSettings addressSettings = getAddressSettingsRepository().getMatch(addressName.toString());
    +
    +         if (!addressesInConfig.contains(addressName.toString()) && addressSettings.getConfigDeleteAddresses()
== DeletionPolicy.FORCE) {
    +            for (Queue queue : listQueues(addressName)) {
    +               ActiveMQServerLogger.LOGGER.undeployQueue(queue.getName());
    +               queue.deleteQueue(true);
    +            }
    +            ActiveMQServerLogger.LOGGER.undeployAddress(addressName);
    +            removeAddressInfo(addressName, null);
    +         } else if (addressSettings.getConfigDeleteQueues() == DeletionPolicy.FORCE)
{
    +            for (Queue queue : listConfiguredQueues(addressName)) {
    +               if (!queuesInConfig.contains(queue.getName().toString())) {
    --- End diff --
    
    no not really.
    
    In this case where we are saying this address is being managed by config.xml we would
need to ensure the address is removed and its queues else we could still be in a situation
with address's managed by config.xml still existing.
    
    Its not quite the same as the queue removal within an active address the section above,
where on queue creation / deletion within an address (but the address remains) we validly
leave alone auto created queues.
    
    On address removal you're essentially saying this address is no longer active and removing
the end to end route.



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message