CONJ-623 / Increase connection logging when Primary node connection f…

…ails (cherry picked from commit d4fcfbe)
mariadb-corporation · Feb 4, 2019 · 9f91ca4 · 9f91ca4
1 parent b4c4c4d
commit 9f91ca4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/failover/AbstractMastersListener.java b/src/main/java/org/mariadb/jdbc/internal/failover/AbstractMastersListener.java
@@ -183,10 +183,12 @@ public HandleErrorResult handleFailover(SQLException qe, Method method, Object[]
             throw new SQLException("Connection has been closed !");
         }
         if (setMasterHostFail()) {
-            logger.warn("SQL Primary node [{}, conn={}] connection fail. Reason : {}",
-                    this.currentProtocol.getHostAddress().toString(),
-                    this.currentProtocol.getServerThreadId(),
-                    qe.getMessage());
+            logger.warn("SQL Primary node [{}, conn={}, local_port={}, timeout={}] connection fail. Reason : {}",
+                        this.currentProtocol.getHostAddress().toString(),
+                        this.currentProtocol.getServerThreadId(),
+                        this.currentProtocol.getSocket().getLocalPort(),
+                        this.currentProtocol.getTimeout(),
+                        qe.getMessage());
             addToBlacklist(currentProtocol.getHostAddress());
         }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -1326,6 +1326,11 @@ public long getServerThreadId() {
         return serverThreadId;
     }
 
+    @Override
+    public Socket getSocket() {
+        return socket;
+    }
+
     public boolean isExplicitClosed() {
         return explicitClosed;
     }

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/Protocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/Protocol.java
@@ -68,6 +68,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.Socket;
 import java.net.SocketException;
 import java.nio.charset.Charset;
 import java.sql.SQLException;
@@ -199,6 +200,8 @@ boolean executeBatchServer(boolean mustExecuteOnMaster, ServerPrepareResult serv
 
     long getServerThreadId();
 
+    Socket getSocket();
+
     void setTransactionIsolation(int level) throws SQLException;
 
     int getTransactionIsolationLevel();