QPID-6429: [Java Broker] Add more logging to investigate the failure to close ports in general (sporadic test failure)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1671265 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 16 insertions, 1 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 350f137a04..bbe22e804e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -43,6 +43,8 @@ import javax.net.ssl.X509TrustManager;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -75,6 +77,8 @@ import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
 public class AmqpPortImpl extends AbstractClientAuthCapablePortWithAuthProvider<AmqpPortImpl> implements AmqpPort<AmqpPortImpl>
 {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(AmqpPortImpl.class);
+
     public static final String DEFAULT_BINDING_ADDRESS = "*";
 
 
@@ -260,10 +264,16 @@ public class AmqpPortImpl extends AbstractClientAuthCapablePortWithAuthProvider<
     @Override
     protected ListenableFuture<Void> beforeClose()
     {
+        LOGGER.debug("beforeClose ");
+
         _closing.set(true);
 
+        //
+
         if (_connectionCount.get() == 0)
         {
+            LOGGER.debug("beforeClose - no connections remain");
+
             _noConnectionsRemain.set(null);
         }
 
@@ -509,8 +519,9 @@ public class AmqpPortImpl extends AbstractClientAuthCapablePortWithAuthProvider<
     @Override
     public int decrementConnectionCount()
     {
-
         int openConnections = _connectionCount.decrementAndGet();
+        LOGGER.debug("decrementConnectionCount {}", openConnections);
+
         int maxOpenConnections = getMaxOpenConnections();
 
         if(maxOpenConnections > 0
@@ -521,6 +532,8 @@ public class AmqpPortImpl extends AbstractClientAuthCapablePortWithAuthProvider<
 
         if (_closing.get() && _connectionCount.get() == 0)
         {
+            LOGGER.debug("decrementConnectionCount - No connections remain");
+
             _noConnectionsRemain.set(null);
         }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index bf7835db1c..b872693297 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
@@ -122,6 +122,8 @@ public class MultiVersionProtocolEngine implements ServerProtocolEngine
 
     public void closed()
     {
+        _logger.debug("Closed");
+
         try
         {
             _delegate.closed();