Merge branch 'hotfix_1.8_3.10.x_27191' into 1.8_release_3.10.x

Author: gituser

rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/async/RdbAsyncReqRow.java

@@ -131,35 +131,41 @@ private void connectWithRetry(Map<String, Object> inputParams, CRow input, Resul
         AtomicLong failCounter = new AtomicLong(0);
         AtomicBoolean finishFlag = new AtomicBoolean(false);
         while(!finishFlag.get()){
-            CountDownLatch latch = new CountDownLatch(1);
-            rdbSqlClient.getConnection(conn -> {
-                try {
-                    if(conn.failed()){
-                        connectionStatus.set(false);
-                        if(failCounter.getAndIncrement() % 1000 == 0){
-                            LOG.error("getConnection error", conn.cause());
-                        }
-                        if(failCounter.get() >= sideInfo.getSideTableInfo().getConnectRetryMaxNum(100)){
-                            resultFuture.completeExceptionally(conn.cause());
-                            finishFlag.set(true);
+            try{
+                CountDownLatch latch = new CountDownLatch(1);
+                rdbSqlClient.getConnection(conn -> {
+                    try {
+                        if(conn.failed()){
+                            connectionStatus.set(false);
+                            if(failCounter.getAndIncrement() % 1000 == 0){
+                                LOG.error("getConnection error", conn.cause());
+                            }
+                            if(failCounter.get() >= sideInfo.getSideTableInfo().getConnectRetryMaxNum(100)){
+                                resultFuture.completeExceptionally(conn.cause());
+                                finishFlag.set(true);
+                            }
+                            return;
                         }
-                        return;
+                        connectionStatus.set(true);
+                        ScheduledFuture<?> timerFuture = registerTimer(input, resultFuture);
+                        cancelTimerWhenComplete(resultFuture, timerFuture);
+                        handleQuery(conn.result(), inputParams, input, resultFuture);
+                        finishFlag.set(true);
+                    } catch (Exception e) {
+                        dealFillDataError(input, resultFuture, e);
+                    } finally {
+                        latch.countDown();
                     }
-                    connectionStatus.set(true);
-                    ScheduledFuture<?> timerFuture = registerTimer(input, resultFuture);
-                    cancelTimerWhenComplete(resultFuture, timerFuture);
-                    handleQuery(conn.result(), inputParams, input, resultFuture);
-                    finishFlag.set(true);
-                } catch (Exception e) {
-                    dealFillDataError(input, resultFuture, e);
-                } finally {
-                    latch.countDown();
+                });
+                try {
+                    latch.await();
+                } catch (InterruptedException e) {
+                    LOG.error("", e);
                 }
-            });
-            try {
-                latch.await();
-            } catch (InterruptedException e) {
-                LOG.error("", e);
+
+            } catch (Exception e){
+                //数据源队列溢出情况
+                connectionStatus.set(false);
             }
             if(!finishFlag.get()){
                 try {