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 34A311FF139 for ; Tue, 24 Feb 2026 14:49:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AF95BC0A; Tue, 24 Feb 2026 14:50:04 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 2/3] s3-client: move exponential backoff to after the response state check Date: Tue, 24 Feb 2026 14:49:43 +0100 Message-ID: <20260224134944.593408-3-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: 1771940984104 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: FLC3YU7HJ5DRLMM33FSZN7AHQECY7FND X-Message-ID-Hash: FLC3YU7HJ5DRLMM33FSZN7AHQECY7FND 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 exponential backup must only be performed after transient error states anyways, so move it to the end of the loop, further avoiding an unneeded retry counter check. Since the put rate limiter remains in-place, this now also correctly accounts for the additional exponential backoff time, already doing some of the potential delay. Signed-off-by: Christian Ebner --- changes since version 1: - no changes proxmox-s3-client/src/client.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 5e30aa12..f3e5eb45 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -380,11 +380,6 @@ impl S3Client { } } - if retry > 0 { - let backoff_secs = S3_HTTP_REQUEST_RETRY_BACKOFF_DEFAULT * 3_u32.pow(retry as u32); - tokio::time::sleep(backoff_secs).await; - } - let response = if let Some(deadline) = deadline { tokio::time::timeout_at(deadline, self.client.request(request)) .await @@ -401,6 +396,9 @@ impl S3Client { } } } + + let backoff_secs = S3_HTTP_REQUEST_RETRY_BACKOFF_DEFAULT * 3_u32.pow(retry as u32); + tokio::time::sleep(backoff_secs).await; } bail!("failed to send request exceeding retries"); -- 2.47.3