From 7efb84ccd13a66cc23b464bbb10e51a71cb0bde3 Mon Sep 17 00:00:00 2001 From: Hu Shenggang Date: Fri, 22 Nov 2024 16:26:33 +0800 Subject: [PATCH 1/2] [opt](brpc) Make the timeout of brpc checking configurable --- be/src/common/config.cpp | 2 ++ be/src/common/config.h | 2 ++ be/src/runtime/fragment_mgr.cpp | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index 2938e81a25eb01..d4294df3158363 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -554,6 +554,8 @@ DEFINE_Bool(enable_brpc_builtin_services, "true"); // Enable brpc connection check DEFINE_Bool(enable_brpc_connection_check, "false"); +DEFINE_mInt64(brpc_connection_check_timeout_ms, "1000"); + // The maximum amount of data that can be processed by a stream load DEFINE_mInt64(streaming_load_max_mb, "102400"); // Some data formats, such as JSON, cannot be streamed. diff --git a/be/src/common/config.h b/be/src/common/config.h index e6247f596a177c..f63f792f37c703 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -1018,6 +1018,8 @@ DECLARE_Bool(enable_brpc_builtin_services); DECLARE_Bool(enable_brpc_connection_check); +DECLARE_mInt64(brpc_connection_check_timeout_ms); + // Max waiting time to wait the "plan fragment start" rpc. // If timeout, the fragment will be cancelled. // This parameter is usually only used when the FE loses connection, diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp index 16b75794511c06..0430d712cd577c 100644 --- a/be/src/runtime/fragment_mgr.cpp +++ b/be/src/runtime/fragment_mgr.cpp @@ -1062,12 +1062,15 @@ void FragmentMgr::_check_brpc_available(const std::shared_ptr(100, config::brpc_connection_check_timeout_ms); + while (true) { PHandShakeRequest request; request.set_hello(message); PHandShakeResponse response; brpc::Controller cntl; - cntl.set_timeout_ms(500 * (failed_count + 1)); + cntl.set_timeout_ms(check_timeout_ms); cntl.set_max_retry(10); brpc_stub->hand_shake(&cntl, &request, &response, nullptr); From 29eccc670bcf0ab4cabafcd779f7eac3b4ed52ac Mon Sep 17 00:00:00 2001 From: Jerry Hu Date: Mon, 25 Nov 2024 11:12:54 +0800 Subject: [PATCH 2/2] default 10s --- be/src/common/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index d4294df3158363..2317487ced60a7 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -554,7 +554,7 @@ DEFINE_Bool(enable_brpc_builtin_services, "true"); // Enable brpc connection check DEFINE_Bool(enable_brpc_connection_check, "false"); -DEFINE_mInt64(brpc_connection_check_timeout_ms, "1000"); +DEFINE_mInt64(brpc_connection_check_timeout_ms, "10000"); // The maximum amount of data that can be processed by a stream load DEFINE_mInt64(streaming_load_max_mb, "102400");