This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch dev-1.0.1 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/dev-1.0.1 by this push: new a4b6c94450 [refactor]broker rpc timeout configuration parameterization (#10692) a4b6c94450 is described below commit a4b6c9445098b382fad2380170d344e9f1b4db0f Author: jiafeng.zhang <zhang...@gmail.com> AuthorDate: Sat Jul 9 06:27:02 2022 +0800 [refactor]broker rpc timeout configuration parameterization (#10692) --- docs/en/administrator-guide/config/fe_config.md | 6 ++++++ docs/zh-CN/administrator-guide/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/administrator-guide/config/fe_config.md b/docs/en/administrator-guide/config/fe_config.md index 1a4f90a4ea..37c8dc46a7 100644 --- a/docs/en/administrator-guide/config/fe_config.md +++ b/docs/en/administrator-guide/config/fe_config.md @@ -1456,6 +1456,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/administrator-guide/config/fe_config.md b/docs/zh-CN/administrator-guide/config/fe_config.md index 2636c6b940..d84187f3f1 100644 --- a/docs/zh-CN/administrator-guide/config/fe_config.md +++ b/docs/zh-CN/administrator-guide/config/fe_config.md @@ -1465,6 +1465,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 1b77d3ed43..1e0abf24fe 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 e289b91b99..c267f76fcc 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 @@ -531,6 +531,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-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org