You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/08 22:27:07 UTC

[doris] branch master updated: [refactor]broker rpc timeout configuration parameterization (#10692)

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 3229730933 [refactor]broker rpc timeout configuration parameterization (#10692)
3229730933 is described below

commit 3229730933e2b8c7b6a8817bf77fa98e04d0ed17
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Sat Jul 9 06:27:02 2022 +0800

    [refactor]broker rpc timeout configuration parameterization (#10692)
---
 docs/en/docs/admin-manual/config/fe-config.md                    | 6 ++++++
 docs/zh-CN/docs/admin-manual/config/fe-config.md                 | 6 ++++++
 fe/fe-core/src/main/java/org/apache/doris/common/ClientPool.java | 2 +-
 fe/fe-core/src/main/java/org/apache/doris/common/Config.java     | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/en/docs/admin-manual/config/fe-config.md b/docs/en/docs/admin-manual/config/fe-config.md
index f37e64564e..21e9fe5623 100644
--- 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
index b99d1569a1..5aa42bd793 100644
--- 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
index 9bb0b45589..7308a22540 100644
--- 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
index c74f91750d..305fb9a627 100644
--- 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
      */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org