Merge 36652c2 into 0fc2fe9

apache · May 21, 2024 · e6211a8 · e6211a8
2 parents 0fc2fe9 + 36652c2
commit e6211a8
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/...se/src/main/java/org/apache/dolphinscheduler/extract/base/client/NettyRemotingClient.java b/...se/src/main/java/org/apache/dolphinscheduler/extract/base/client/NettyRemotingClient.java
@@ -141,7 +141,7 @@ public IRpcResponse sendSync(final Host host,
         return iRpcResponse;
     }
 
-    private Channel getOrCreateChannel(Host host) {
+    Channel getOrCreateChannel(Host host) {
         Channel channel = channels.get(host);
         if (channel != null && channel.isActive()) {
             return channel;
@@ -166,13 +166,10 @@ private Channel getOrCreateChannel(Host host) {
      * @param host host
      * @return channel
      */
-    private Channel createChannel(Host host) {
+    Channel createChannel(Host host) {
         try {
-            ChannelFuture future;
-            synchronized (bootstrap) {
-                future = bootstrap.connect(new InetSocketAddress(host.getIp(), host.getPort()));
-            }
-            future.await(clientConfig.getConnectTimeoutMillis());
+            ChannelFuture future = bootstrap.connect(new InetSocketAddress(host.getIp(), host.getPort()));
+            future = future.sync();
             if (future.isSuccess()) {
                 return future.channel();
             } else {