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

ARTEMIS-2797 Logging redeployment errors and speeding RedeployTest

This commit is contained in:
Clebert Suconic 2020-06-30 22:44:37 -04:00
parent 562bb965ae
commit 257d353896
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4003,7 +4003,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
} }
} }
for (final SimpleString divertName : divertsToRemove) { for (final SimpleString divertName : divertsToRemove) {
try {
destroyDivert(divertName); destroyDivert(divertName);
} catch (Throwable e) {
logger.warn("Divert " + divertName + " could not be removed", e);
}
} }
ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses"); ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses");

1
tests/integration-tests/src/test/resources/reload-queue-filter-removed.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core"> <core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled> <security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled> <persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors> <acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

2
tests/integration-tests/src/test/resources/reload-queue-filter-updated-empty.xml
View File

@ -25,6 +25,8 @@ under the License.
<core xmlns="urn:activemq:core"> <core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled> <security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled> <persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors> <acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

1
tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core"> <core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled> <security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled> <persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors> <acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

1
tests/integration-tests/src/test/resources/reload-queue-filter.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core"> <core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled> <security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled> <persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors> <acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>