This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 9f7c8c2edf3 branch-4.0: [chore](config) Add `request_timeout` config
for aws client configuration #60906 (#61159)
9f7c8c2edf3 is described below
commit 9f7c8c2edf37b99baa9c3f0dad7ed8b8684432d9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 10 09:41:53 2026 +0800
branch-4.0: [chore](config) Add `request_timeout` config for aws client
configuration #60906 (#61159)
Cherry-picked from #60906
Co-authored-by: Yixuan Wang <[email protected]>
---
be/src/common/config.cpp | 1 +
be/src/common/config.h | 1 +
be/src/util/s3_util.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp
index c18c2e85225..dd6f80c4a48 100644
--- a/be/src/common/config.cpp
+++ b/be/src/common/config.cpp
@@ -1422,6 +1422,7 @@ DEFINE_mInt32(max_s3_client_retry, "10");
DEFINE_mInt32(s3_read_base_wait_time_ms, "100");
DEFINE_mInt32(s3_read_max_wait_time_ms, "800");
DEFINE_mBool(enable_s3_object_check_after_upload, "true");
+DEFINE_mInt32(aws_client_request_timeout_ms, "30000");
DEFINE_mBool(enable_s3_rate_limiter, "false");
DEFINE_mInt64(s3_get_bucket_tokens, "1000000000000000000");
diff --git a/be/src/common/config.h b/be/src/common/config.h
index a06317f6feb..94e89394275 100644
--- a/be/src/common/config.h
+++ b/be/src/common/config.h
@@ -1538,6 +1538,7 @@ DECLARE_mInt32(max_s3_client_retry);
DECLARE_mInt32(s3_read_base_wait_time_ms);
DECLARE_mInt32(s3_read_max_wait_time_ms);
DECLARE_mBool(enable_s3_object_check_after_upload);
+DECLARE_mInt32(aws_client_request_timeout_ms);
// write as inverted index tmp directory
DECLARE_String(tmp_file_dir);
diff --git a/be/src/util/s3_util.h b/be/src/util/s3_util.h
index 39e5d8e807c..c85e831fa07 100644
--- a/be/src/util/s3_util.h
+++ b/be/src/util/s3_util.h
@@ -150,6 +150,7 @@ public:
// So here we use a static instance, and deep copy every time
// to avoid unnecessary operations.
static Aws::Client::ClientConfiguration instance;
+ instance.requestTimeoutMs = config::aws_client_request_timeout_ms;
return instance;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
