You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2020/11/02 16:53:23 UTC

[activemq-artemis] branch master updated (c320d8b -> fa4064c)

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

clebertsuconic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.


    from c320d8b  This closes #3325
     new a2d6d1d  NO-JIRA avoiding having rogue process when running test
     new fa4064c  ARTEMIS-2969 / ARTEMIS-2937 RedoConnection should call protonRemotingConnection.destroy

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../artemis/protocol/amqp/connect/AMQPBrokerConnection.java      | 9 ++++++---
 .../tests/integration/amqp/connect/QpidDispatchPeerTest.java     | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)


[activemq-artemis] 01/02: NO-JIRA avoiding having rogue process when running test

Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a2d6d1d89d67d469a1e3ea7857b325d57728ea60
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Nov 2 11:23:52 2020 -0500

    NO-JIRA avoiding having rogue process when running test
---
 .../artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
index 0ab1e45..54e5397 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
@@ -74,6 +74,7 @@ public class QpidDispatchPeerTest extends AmqpClientTestSupport {
 
    @Before
    public void startQpidRouter() throws Exception {
+      ExecuteUtil.runCommand(false, "killall", "-9", "qdrouterd"); // killing any previous running qdrouterd that may have been left from the execution
       URL qpidConfig = this.getClass().getClassLoader().getResource("QpidRouterPeerTest-qpidr.conf");
       qpidProcess = ExecuteUtil.run(true, "qdrouterd", "-c", qpidConfig.getFile());
    }


[activemq-artemis] 02/02: ARTEMIS-2969 / ARTEMIS-2937 RedoConnection should call protonRemotingConnection.destroy

Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fa4064cfd784e93a02a3905b16b8c9302fe105fc
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Nov 2 11:16:36 2020 -0500

    ARTEMIS-2969 / ARTEMIS-2937 RedoConnection should call protonRemotingConnection.destroy
    
    Instead of calling destroy, redo was closing the Netty connection directly leaving the job of destroy delayed until TTL
---
 .../artemis/protocol/amqp/connect/AMQPBrokerConnection.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
index 1e6d52b..b4b336d 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
@@ -524,15 +524,18 @@ public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener,
       // keeping a single executor thread to this purpose would simplify things
       connectExecutor.execute(() -> {
          if (connecting) {
-            logger.debug("Broker connection " + this.getName() + " was already in retry mode, exception or retry no captured");
+            if (logger.isDebugEnabled()) {
+               logger.debug("Broker connection " + this.getName() + " was already in retry mode, exception or retry not captured");
+            }
             return;
          }
          connecting = true;
 
          try {
-            if (connection != null) {
-               connection.close();
+            if (protonRemotingConnection != null) {
+               protonRemotingConnection.destroy();
                connection = null;
+               protonRemotingConnection = null;
             }
          } catch (Throwable e) {
             logger.warn(e.getMessage(), e);