From b52a02c7de5b82de269eb12ddf6a59faa3002bea Mon Sep 17 00:00:00 2001
From: zy-kkk <zhongyk10@gmail.com>
Date: Wed, 13 Mar 2024 10:39:16 +0800
Subject: [PATCH] [fix](jdbc catalog) Clean up the connection pool after
 failure to initialize the client (#31950)

---
 .../apache/doris/datasource/jdbc/client/JdbcClient.java    | 4 ++--
 .../doris/datasource/jdbc/client/JdbcMySQLClient.java      | 5 +++--
 .../doris/datasource/jdbc/client/JdbcOceanBaseClient.java  | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
index 60daac66b6df77..7840e4cf0aee75 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
@@ -171,8 +171,8 @@ public Connection getConnection() throws JdbcClientException {
         try {
             conn = dataSource.getConnection();
         } catch (Exception e) {
-            String errorMessage = String.format("Can not connect to jdbc due to error: %s, Catalog name: %s", e,
-                    this.getCatalog());
+            String errorMessage = String.format("Can not connect to jdbc due to error: %s, Catalog name: %s",
+                    e.getMessage(), this.getCatalog());
             throw new JdbcClientException(errorMessage, e);
         }
         return conn;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
index 9e0b4f00dd4ca9..b115559a6b70cf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
@@ -56,8 +56,9 @@ protected JdbcMySQLClient(JdbcClientConfig jdbcClientConfig) {
                 String versionComment = rs.getString("Value");
                 isDoris = versionComment.toLowerCase().contains("doris");
             }
-        } catch (SQLException e) {
-            throw new JdbcClientException("Failed to determine MySQL Version Comment", e);
+        } catch (SQLException | JdbcClientException e) {
+            closeClient();
+            throw new JdbcClientException("Failed to initialize JdbcMySQLClient: %s", e.getMessage());
         } finally {
             close(rs, stmt, conn);
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java
index 14d5d5f1848db3..18cebd7bb96550 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java
@@ -47,11 +47,12 @@ public JdbcOceanBaseClient(JdbcClientConfig jdbcClientConfig) {
                     currentClient = new JdbcOracleClient(jdbcClientConfig);
                     setOracleMode();
                 } else {
-                    throw new JdbcClientException("Unsupported compatibility mode: " + compatibilityMode);
+                    throw new JdbcClientException("Unsupported OceanBase compatibility mode: " + compatibilityMode);
                 }
             }
-        } catch (SQLException e) {
-            throw new JdbcClientException("Failed to determine OceanBase compatibility mode", e);
+        } catch (SQLException | JdbcClientException e) {
+            closeClient();
+            throw new JdbcClientException("Failed to initialize JdbcOceanBaseClient", e.getMessage());
         } finally {
             close(rs, stmt, conn);
         }