[refactor]broker rpc timeout configuration parameterization (apache#1…

…0692)
Lchangliang · Jul 8, 2022 · 3229730 · 3229730
1 parent ed4b214
commit 3229730
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/docs/en/docs/admin-manual/config/fe-config.md b/docs/en/docs/admin-manual/config/fe-config.md
@@ -1458,6 +1458,12 @@ MasterOnly：true
 
 Default broker load timeout
 
+### broker_timeout_ms
+
+Default：10000   （10s）
+
+Default broker RPC timeout
+
 ### load_running_job_num_limit
 
 Default：0

diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md b/docs/zh-CN/docs/admin-manual/config/fe-config.md
@@ -1467,6 +1467,12 @@ load 最大超时时间，适用于除 stream load 之外的所有类型的加
 
 Broker load 的默认超时时间
 
+### `broker_timeout_ms`
+
+默认值：10000   （10秒）
+
+Broker rpc 的默认超时时间
+
 ### `load_running_job_num_limit`
 
 默认值：0

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java b/fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java
@@ -50,7 +50,7 @@ public class ClientPool {
     }
 
     static GenericKeyedObjectPoolConfig brokerPoolConfig = new GenericKeyedObjectPoolConfig();
-    static int brokerTimeoutMs = 10000;
+    static int brokerTimeoutMs = Config.broker_timeout_ms;
 
     static {
         brokerPoolConfig.setLifo(true);            // set Last In First Out strategy

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Config.java b/fe/fe-core/src/main/java/org/apache/doris/common/Config.java
@@ -547,6 +547,10 @@ public class Config extends ConfigBase {
     @ConfField(mutable = true, masterOnly = true)
     public static int broker_load_default_timeout_second = 14400; // 4 hour
 
+    /**
+     * Broker rpc timeout
+     */
+    @ConfField public static int broker_timeout_ms = 10000; // 10s
     /**
      * Default non-streaming mini load timeout
      */