Added trace logging around connection pool

Author: lutovich

driver/src/main/java/org/neo4j/driver/internal/net/pooling/BlockingPooledConnectionQueue.java

@@ -18,9 +18,7 @@
  */
 package org.neo4j.driver.internal.net.pooling;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
@@ -40,8 +38,6 @@
  */
 public class BlockingPooledConnectionQueue
 {
-    public static final String LOG_NAME = "ConnectionQueue";
-
     /** The backing queue, keeps track of connections currently in queue */
     private final BlockingQueue<PooledConnection> queue;
     private final Logger logger;
@@ -69,7 +65,9 @@ public boolean offer( PooledConnection pooledConnection )
         acquiredConnections.remove( pooledConnection );
         boolean offer = queue.offer( pooledConnection );
         // not added back to the queue, dispose of the connection
-        if (!offer) {
+        if ( !offer )
+        {
+            trace( "Queue is at capacity. Connection will be disposed" );
             pooledConnection.dispose();
         }
         if (isTerminating.get()) {
@@ -93,8 +91,13 @@ public PooledConnection acquire( Supplier<PooledConnection> supplier )
         PooledConnection connection = queue.poll();
         if ( connection == null )
         {
+            trace( "No Idle connections. Creating new connection." );
             connection = supplier.get();
         }
+        else
+        {
+            trace( "Acquiring connection." );
+        }
         acquiredConnections.add( connection );
 
         if (isTerminating.get()) {
@@ -105,11 +108,6 @@ public PooledConnection acquire( Supplier<PooledConnection> supplier )
         return connection;
     }
 
-    public List<PooledConnection> toList()
-    {
-        return new ArrayList<>( queue );
-    }
-
     public boolean isEmpty()
     {
         return queue.isEmpty();
@@ -140,6 +138,8 @@ public void terminate()
     {
         if ( isTerminating.compareAndSet( false, true ) )
         {
+            trace( "Initiating connection queue termination." );
+
             while ( !queue.isEmpty() )
             {
                 PooledConnection idleConnection = queue.poll();
@@ -170,6 +170,17 @@ private void disposeSafely( PooledConnection connection )
 
     private static Logger createLogger( BoltServerAddress address, Logging logging )
     {
-        return new DelegatingLogger( logging.getLog( LOG_NAME ), address.toString() );
+        Logger log = logging.getLog( BlockingPooledConnectionQueue.class.getSimpleName() );
+        return new DelegatingLogger( log, address.toString() );
+    }
+
+    private void trace( String message )
+    {
+        //Call to activeConnections is costly. This if block is to avoid that.
+        if ( logger.isTraceEnabled() )
+        {
+            logger.trace( "%s ActiveConnections %s IdleConnections %s",
+                    message, activeConnections(), queue.size() );
+        }
     }
 }

driver/src/main/java/org/neo4j/driver/internal/net/pooling/SocketConnectionPool.java

@@ -30,6 +30,7 @@
 import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.internal.util.Clock;
 import org.neo4j.driver.internal.util.Supplier;
+import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
 
 /**
@@ -58,6 +59,7 @@ public class SocketConnectionPool implements ConnectionPool
     private final ConnectionValidator<PooledConnection> connectionValidator;
     private final Clock clock;
     private final Logging logging;
+    private final Logger logger;
 
     public SocketConnectionPool( PoolSettings poolSettings, Connector connector, Clock clock, Logging logging )
     {
@@ -66,6 +68,7 @@ public SocketConnectionPool( PoolSettings poolSettings, Connector connector, Clo
         this.connectionValidator = new PooledConnectionValidator( this );
         this.clock = clock;
         this.logging = logging;
+        this.logger = logging.getLog( SocketConnectionPool.class.getSimpleName() );
     }
 
     @Override
@@ -85,6 +88,7 @@ public void purge( BoltServerAddress address )
         BlockingPooledConnectionQueue connections = pools.remove( address );
         if ( connections != null )
         {
+            logger.trace( "Purging address %s", address );
             connections.terminate();
         }
     }
@@ -107,6 +111,7 @@ public void close()
     {
         if ( closed.compareAndSet( false, true ) )
         {
+            logger.trace( "Initiating connection pool termination" );
             for ( BlockingPooledConnectionQueue pool : pools.values() )
             {
                 pool.terminate();