Merge pull request #62665 from ClickHouse/cherrypick/24.3/59369e99c57…

…a0d3e403ab4dc1248427ab499d892 Cherry pick #62648 to 24.3: set correct defaults for s3 storage and backups
ClickHouse · Apr 15, 2024 · f826fd9 · f826fd9
2 parents 9f291a6 + 59369e9
commit f826fd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
@@ -68,6 +68,8 @@ namespace
         client_configuration.connectTimeoutMs = 10 * 1000;
         /// Requests in backups can be extremely long, set to one hour
         client_configuration.requestTimeoutMs = 60 * 60 * 1000;
+        client_configuration.http_keep_alive_timeout = S3::DEFAULT_KEEP_ALIVE_TIMEOUT;
+        client_configuration.http_keep_alive_max_requests = S3::DEFAULT_KEEP_ALIVE_MAX_REQUESTS;
 
         S3::ClientSettings client_settings{
             .use_virtual_addressing = s3_uri.is_virtual_hosted_style,

diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
@@ -1427,6 +1427,8 @@ void StorageS3::Configuration::connect(const ContextPtr & context)
     /// seems as we don't use it
     client_configuration.maxConnections = static_cast<unsigned>(request_settings.max_connections);
     client_configuration.connectTimeoutMs = local_settings.s3_connect_timeout_ms;
+    client_configuration.http_keep_alive_timeout = S3::DEFAULT_KEEP_ALIVE_TIMEOUT;
+    client_configuration.http_keep_alive_max_requests = S3::DEFAULT_KEEP_ALIVE_MAX_REQUESTS;
 
     auto headers = auth_settings.headers;
     if (!headers_from_ast.empty())