From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7CA341FF17C for ; Wed, 20 Aug 2025 11:56:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47DBE375D7; Wed, 20 Aug 2025 11:58:22 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 20 Aug 2025 11:58:03 +0200 Message-ID: <20250820095807.172722-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250820095807.172722-1-c.ebner@proxmox.com> References: <20250820095807.172722-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755683855282 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [client.rs] Subject: [pbs-devel] [PATCH proxmox 1/3] s3-client: allow setting custom timeout when sending requests X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Currently, all types of requests to the S3 API have the same default timeout of 60 seconds, which was determined empirically. Different types of requests to the S3 API will however take quite different time, especially the uploading of objects via a put call depends on the payload size and bandwidth available. Therefore, in preparation for being able to set this on a per-request basis, allow to optionally set the timeout when sending the request. This now also allows to send the request without timeout. Signed-off-by: Christian Ebner --- proxmox-s3-client/src/client.rs | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 3bc2a672..2a48240e 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -283,7 +283,11 @@ impl S3Client { } /// Send API request to the configured endpoint using the inner https client. - async fn send(&self, request: Request) -> Result, Error> { + async fn send( + &self, + request: Request, + timeout: Option, + ) -> Result, Error> { let request = self.prepare(request).await?; if request.method() == Method::PUT { if let Some(limiter) = &self.put_rate_limiter { @@ -294,9 +298,13 @@ impl S3Client { tokio::time::sleep(sleep).await; } } - let response = tokio::time::timeout(S3_HTTP_REQUEST_TIMEOUT, self.client.request(request)) - .await - .context("request timeout")??; + let response = if let Some(timeout) = timeout { + tokio::time::timeout(timeout, self.client.request(request)) + .await + .context("request timeout")?? + } else { + self.client.request(request).await? + }; Ok(response) } @@ -307,7 +315,7 @@ impl S3Client { .method(Method::HEAD) .uri(self.build_uri("/", &[])?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let (parts, _body) = response.into_parts(); match parts.status { @@ -328,7 +336,7 @@ impl S3Client { .method(Method::GET) .uri(self.build_uri("/", &[])?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.list_buckets_response().await } @@ -344,7 +352,7 @@ impl S3Client { .method(Method::HEAD) .uri(self.build_uri(&object_key, &[])?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.head_object_response().await } @@ -361,7 +369,7 @@ impl S3Client { .uri(self.build_uri(&object_key, &[])?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.get_object_response().await } @@ -391,7 +399,7 @@ impl S3Client { .uri(self.build_uri("/", &query)?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.list_objects_v2_response().await } @@ -427,7 +435,7 @@ impl S3Client { let request = request.body(object_data)?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.put_object_response().await } @@ -441,7 +449,7 @@ impl S3Client { .uri(self.build_uri(&object_key, &[])?) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, None).await?; let response_reader = ResponseReader::new(response); response_reader.delete_object_response().await } @@ -468,7 +476,7 @@ impl S3Client { .uri(self.build_uri("/", &[("delete", "")])?) .body(Body::from(body))?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.delete_objects_response().await } @@ -499,7 +507,7 @@ impl S3Client { ) .body(Body::empty())?; - let response = self.send(request).await?; + let response = self.send(request, Some(S3_HTTP_REQUEST_TIMEOUT)).await?; let response_reader = ResponseReader::new(response); response_reader.copy_object_response().await } -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel