include the server thread id (a.k.a connection id) in certain importa…

…nt log messages
mariadb-corporation · Aug 24, 2021 · e0a3fc2 · e0a3fc2
1 parent 0b78458
commit e0a3fc2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -398,6 +398,9 @@ public void close() {
 
   /** Force closes socket and stream readers/writers. */
   public void abort() {
+    if (logger.isDebugEnabled()) {
+      logger.debug("aborting connection {}", serverThreadId);
+    }
     this.explicitClosed = true;
 
     boolean lockStatus = false;

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -1235,7 +1235,8 @@ public boolean ping() throws SQLException {
 
     } catch (IOException e) {
       connected = false;
-      throw new SQLNonTransientConnectionException("Could not ping: " + e.getMessage(), "08000", e);
+      throw new SQLNonTransientConnectionException(
+          "Could not ping connection " + serverThreadId + " : " + e.getMessage(), "08000", e);
     } finally {
       lock.unlock();
     }

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/pool/Pool.java b/src/main/java/org/mariadb/jdbc/internal/util/pool/Pool.java
@@ -188,14 +188,15 @@ private void removeIdleTimeoutConnection() {
       }
 
       if (shouldBeReleased && idleConnections.remove(item)) {
-
+        final long connId = item.getConnection().getServerThreadId();
         totalConnection.decrementAndGet();
         silentCloseConnection(item);
         addConnectionRequest();
         if (logger.isDebugEnabled()) {
           logger.debug(
-              "pool {} connection removed due to inactivity (total:{}, active:{}, pending:{})",
+              "pool {} connection {} removed due to inactivity (total:{}, active:{}, pending:{})",
               poolTag,
+              connId,
               totalConnection.get(),
               getActiveConnections(),
               pendingRequestNumber.get());
@@ -234,8 +235,9 @@ private void addConnection() throws SQLException {
 
       if (logger.isDebugEnabled()) {
         logger.debug(
-            "pool {} new physical connection created (total:{}, active:{}, pending:{})",
+            "pool {} new physical connection {} created (total:{}, active:{}, pending:{})",
             poolTag,
+            connection.getServerThreadId(),
             totalConnection.get(),
             getActiveConnections(),
             pendingRequestNumber.get());
@@ -266,6 +268,7 @@ private MariaDbPooledConnection getIdleConnection(long timeout, TimeUnit timeUni
 
       if (item != null) {
         MariaDbConnection connection = item.getConnection();
+        final long connId = connection.getServerThreadId();
         try {
           if (TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - item.getLastUsed().get())
               > options.poolValidMinDelay) {
@@ -292,8 +295,9 @@ private MariaDbPooledConnection getIdleConnection(long timeout, TimeUnit timeUni
         addConnectionRequest();
         if (logger.isDebugEnabled()) {
           logger.debug(
-              "pool {} connection removed from pool due to failed validation (total:{}, active:{}, pending:{})",
+              "pool {} connection {} removed from pool due to failed validation (total:{}, active:{}, pending:{})",
               poolTag,
+              connId,
               totalConnection.get(),
               getActiveConnections(),
               pendingRequestNumber.get());