Skip to content

Commit 96cedb1

Browse files
authored
chore: back-port object-store-request-timeout arg (#26848)
1 parent ef5a95c commit 96cedb1

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

influxdb3/src/commands/serve/cli_params.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ const NON_SENSITIVE_PARAMS: &[&str] = &[
9696
"object-store-http2-only",
9797
"object-store-http2-max-frame-size",
9898
"object-store-max-retries",
99+
"object-store-request-timeout",
99100
"object-store-retry-timeout",
100101
"object-store-tls-allow-insecure",
101102
"object-store-tls-ca",

influxdb3_clap_blocks/src/object_store.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,17 @@ macro_rules! object_store_config_inner {
657657
)]
658658
pub http2_max_frame_size: Option<u32>,
659659

660+
/// Set HTTP request timeout for object store.
661+
#[clap(
662+
id = gen_name!($prefix, "object-store-request-timeout"),
663+
long = gen_name!($prefix, "object-store-request-timeout"),
664+
env = gen_env!($prefix, "OBJECT_STORE_REQUEST_TIMEOUT"),
665+
value_parser = humantime::parse_duration,
666+
default_value = "30s",
667+
action
668+
)]
669+
pub request_timeout: Duration,
670+
660671
/// The maximum number of times to retry a request
661672
///
662673
/// Set to 0 to disable retries
@@ -752,6 +763,7 @@ macro_rules! object_store_config_inner {
752763
google_service_account: Default::default(),
753764
object_store,
754765
object_store_connection_limit: NonZeroUsize::new(16).unwrap(),
766+
request_timeout: Duration::from_secs(30),
755767
http2_only: Default::default(),
756768
http2_max_frame_size: Default::default(),
757769
max_retries: Default::default(),

0 commit comments

Comments
 (0)