Merge pull request #1134 in CORE/base-third from feature/10.0 to research/10.0

* commit '18a52394e816278af98323bf99c52c1fcdbe2a07':
  BI-74885 fix: clickhouse数据连接出错时一直尝试连接
  BI-74885 fix: clickhouse数据连接出错时一直尝试连接
  BI-74885 fix: clickhouse数据连接出错时一直尝试连接

fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidDataSource.java

@@ -2164,10 +2164,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 try {
                     connection = createPhysicalConnection();
                     setFailContinuous(false);
-                } catch (SQLException e) {
+                } catch (SQLException | RuntimeException e) {
-                    LOG.error("create connection error, url: " + jdbcUrl + ", errorCode " + e.getErrorCode()
+                    if (e instanceof SQLException) {
-                            + ", state " + e.getSQLState(), e);
+                        LOG.error("create connection error, url: " + jdbcUrl + ", errorCode " + ((SQLException)e).getErrorCode()
-
+                                + ", state " + ((SQLException)e).getSQLState(), e);
+                    } else {
+                        LOG.error("create connection error", e);
+                    }
                     errorCount++;
                     if (errorCount > connectionErrorRetryAttempts && timeBetweenConnectErrorMillis > 0) {
                         // fail over retry attempts
@@ -2193,10 +2196,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                         DruidDataSource.this.doSomethingBeforeCreationThreadBreak();
                         break;
                     }
-                } catch (RuntimeException e) {
-                    LOG.error("create connection error", e);
-                    setFailContinuous(true);
-                    continue;
                 } catch (Error e) {
                     LOG.error("create connection error", e);
                     setFailContinuous(true);