From 7d49fbbaec1ffee60512313e18e1902e40fc4626 Mon Sep 17 00:00:00 2001
From: CalvinKirs <acm_master@163.com>
Date: Sun, 6 Sep 2020 16:31:35 +0800
Subject: [PATCH] [Improvement][remote] set connect time out (#3670)

---
 .../remote/NettyRemotingClient.java           |  1 +
 .../remote/config/NettyClientConfig.java      | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
index e5e3430ff..38f00fb4f 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
@@ -159,6 +159,7 @@ public class NettyRemotingClient {
             .option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
             .option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
             .option(ChannelOption.SO_RCVBUF, clientConfig.getReceiveBufferSize())
+            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientConfig.getConnectTimeoutMillis())
             .handler(new ChannelInitializer<SocketChannel>() {
                 @Override
                 public void initChannel(SocketChannel ch) throws Exception {
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/config/NettyClientConfig.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/config/NettyClientConfig.java
index 831e05f7e..739cbbebe 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/config/NettyClientConfig.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/config/NettyClientConfig.java
@@ -14,22 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.remote.config;
 
 import org.apache.dolphinscheduler.remote.utils.Constants;
 
 /**
- *  netty client config
+ * netty client config
  */
 public class NettyClientConfig {
 
     /**
-     *  worker threads，default get machine cpus
+     * worker threads，default get machine cpus
      */
     private int workerThreads = Constants.CPUS;
 
     /**
-     *  whether tpc delay
+     * whether tpc delay
      */
     private boolean tcpNoDelay = true;
 
@@ -39,15 +40,20 @@ public class NettyClientConfig {
     private boolean soKeepalive = true;
 
     /**
-     *  send buffer size
+     * send buffer size
      */
     private int sendBufferSize = 65535;
 
     /**
-     *  receive buffer size
+     * receive buffer size
      */
     private int receiveBufferSize = 65535;
 
+    /**
+     * connect timeout millis
+     */
+    private int connectTimeoutMillis = 3000;
+
     public int getWorkerThreads() {
         return workerThreads;
     }
@@ -88,4 +94,11 @@ public class NettyClientConfig {
         this.receiveBufferSize = receiveBufferSize;
     }
 
+    public int getConnectTimeoutMillis() {
+        return connectTimeoutMillis;
+    }
+
+    public void setConnectTimeoutMillis(int connectTimeoutMillis) {
+        this.connectTimeoutMillis = connectTimeoutMillis;
+    }
 }
-- 
GitLab