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 43F4A1FF13E for ; Fri, 23 Jan 2026 15:58:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7832B10520; Fri, 23 Jan 2026 15:59:19 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 23 Jan 2026 15:58:33 +0100 Message-ID: <20260123145835.625914-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123145835.625914-1-c.ebner@proxmox.com> References: <20260123145835.625914-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1769180266877 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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: early return when request timeout deadline reached 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" 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 --- 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 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel