From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7B6841FF139 for ; Tue, 24 Feb 2026 14:49:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9AFEFBCBE; Tue, 24 Feb 2026 14:50:33 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 1/3] s3-client: early return when request timeout deadline reached Date: Tue, 24 Feb 2026 14:49:42 +0100 Message-ID: <20260224134944.593408-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224134944.593408-1-c.ebner@proxmox.com> References: <20260224134944.593408-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771940983866 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: SK4FBFNYPO6CD4AKWKDPNDQPIGBY7ZW3 X-Message-ID-Hash: SK4FBFNYPO6CD4AKWKDPNDQPIGBY7ZW3 X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The optional timeout value generates a deadline, after which the request times out and fails, independent from retries. The current implementation however unneededly continues to loop over the remaining retires, including potential put rate limit delay and exponential backoff time, creating unjustified additional latency. Fix this by early returning with error once the deadline is reached. Signed-off-by: Christian Ebner --- changes since version 1: - no changes proxmox-s3-client/src/client.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 83176b39..5e30aa12 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -386,23 +386,20 @@ impl S3Client { } let response = if let Some(deadline) = deadline { - tokio::time::timeout_at(deadline, self.client.request(request)).await + tokio::time::timeout_at(deadline, self.client.request(request)) + .await + .context("request timeout reached")? } else { - Ok(self.client.request(request).await) + self.client.request(request).await }; match response { - Ok(Ok(response)) => return Ok(response), - Ok(Err(err)) => { + Ok(response) => return Ok(response), + Err(err) => { if retry >= MAX_S3_HTTP_REQUEST_RETRY - 1 { return Err(err.into()); } } - Err(_elapsed) => { - if retry >= MAX_S3_HTTP_REQUEST_RETRY - 1 { - bail!("request timed out exceeding retries"); - } - } } } -- 2.47.3