From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox v5 02/12] s3-client: distinguish transient errors and throttled requests
Date: Mon, 16 Nov 2026 10:54:24 +0100 [thread overview]
Message-ID: <20261116095434.110541-3-c.ebner@proxmox.com> (raw)
In-Reply-To: <20261116095434.110541-1-c.ebner@proxmox.com>
Currently failed requests are retried after a fixed 1 and 3 seconds,
regardless of the cause. This is longer than needed for connection or
server errors, only intended as graceful recovery period for heavily
loaded S3 APIs in the previous implementation.
Therefore, distinguish these 2 modes by following the backoff logic
use by the AWS SDK's standard retry mode instead: wait base * 2^retry,
capped at 20 seconds, with a base delay of 100 ms for transient errors
and 2 second for throttling. These values are chosen to be double the
ones provided by the guide, in order to give on average the same
throttling backoff delay as previously used by the client, once
uniformly distributed jitter is introduced as well in subsequent
changes.
Cover only the too many requests http status code for now, additional
status codes will use this based on the error code in the response
body parsing as extended in subsequent changes.
Link: https://docs.aws.amazon.com/sdkref/latest/guide/feature-retry-behavior.html
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
proxmox-s3-client/src/client.rs | 106 +++++++++++++++++++++++++++-----
1 file changed, 92 insertions(+), 14 deletions(-)
diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs
index 3f2a7107..28646aee 100644
--- a/proxmox-s3-client/src/client.rs
+++ b/proxmox-s3-client/src/client.rs
@@ -47,7 +47,11 @@ const MAX_S3_UPLOAD_RETRY: usize = 3;
// Assumed minimum upload rate of 1 KiB/s for dynamic put object request timeout calculation.
const S3_MIN_ASSUMED_UPLOAD_RATE: u64 = 1024;
const MAX_S3_HTTP_REQUEST_RETRY: usize = 3;
-const S3_HTTP_REQUEST_RETRY_BACKOFF_DEFAULT: Duration = Duration::from_secs(1);
+// Retry backoff as used by the AWS SDKs standard retry mode, see
+// https://docs.aws.amazon.com/sdkref/latest/guide/feature-retry-behavior.html
+const S3_RETRY_BASE_DELAY_TRANSIENT: Duration = Duration::from_millis(100);
+const S3_RETRY_BASE_DELAY_THROTTLING: Duration = Duration::from_secs(2);
+const S3_RETRY_MAX_BACKOFF: Duration = Duration::from_secs(20);
static SHARED_COUNTER_FLUSHER: LazyLock<RwLock<MmapFlusher>> =
LazyLock::new(|| RwLock::new(MmapFlusher::new()));
@@ -506,19 +510,20 @@ impl S3Client {
self.client.request(request).await
};
- let do_retry = match &response {
- Ok(response) => matches!(
- response.status(),
+ let retry_reason = match &response {
+ Ok(response) => match response.status() {
StatusCode::INTERNAL_SERVER_ERROR
- | StatusCode::BAD_GATEWAY
- | StatusCode::SERVICE_UNAVAILABLE
- | StatusCode::GATEWAY_TIMEOUT
- | StatusCode::TOO_MANY_REQUESTS
- ),
- Err(_) => true,
+ | StatusCode::BAD_GATEWAY
+ | StatusCode::SERVICE_UNAVAILABLE
+ | StatusCode::GATEWAY_TIMEOUT => Some(RetryReason::Transient),
+ StatusCode::TOO_MANY_REQUESTS => Some(RetryReason::Throttling),
+ _ => None,
+ },
+ Err(_) => Some(RetryReason::Transient),
};
- if !do_retry || retry >= MAX_S3_HTTP_REQUEST_RETRY - 1 {
+ let Some(retry_reason) = retry_reason.filter(|_| retry < MAX_S3_HTTP_REQUEST_RETRY - 1)
+ else {
if let Some(counters) = self.request_counters.as_ref()
&& response.is_ok()
{
@@ -533,10 +538,9 @@ impl S3Client {
let _ = SHARED_COUNTER_FLUSHER.read().unwrap().request_flush();
}
return Ok(response?);
- }
+ };
- let backoff_secs = S3_HTTP_REQUEST_RETRY_BACKOFF_DEFAULT * 3_u32.pow(retry as u32);
- tokio::time::sleep(backoff_secs).await;
+ tokio::time::sleep(retry_backoff(retry_reason, retry)).await;
}
bail!("failed to send request exceeding retries");
@@ -1026,10 +1030,84 @@ impl S3Client {
}
}
+#[derive(Debug, PartialEq)]
+enum RetryReason {
+ Transient,
+ Throttling,
+}
+
+impl RetryReason {
+ fn base_delay(self) -> Duration {
+ match self {
+ Self::Transient => S3_RETRY_BASE_DELAY_TRANSIENT,
+ Self::Throttling => S3_RETRY_BASE_DELAY_THROTTLING,
+ }
+ }
+}
+
+/// Helper to get exponential backoff duration based on retry reason and count.
+///
+/// Calculates how long to wait before the next retry attempt for a request.
+/// The duration is limited by an upper bond of [`S3_RETRY_MAX_BACKOFF`].
+fn retry_backoff(reason: RetryReason, retry: usize) -> Duration {
+ u32::try_from(retry)
+ .ok()
+ .and_then(|retry| 2_u32.checked_pow(retry))
+ .and_then(|factor| reason.base_delay().checked_mul(factor))
+ .map_or(S3_RETRY_MAX_BACKOFF, |backoff| {
+ backoff.min(S3_RETRY_MAX_BACKOFF)
+ })
+}
+
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn retry_backoff_by_reason() {
+ assert_eq!(
+ retry_backoff(RetryReason::Transient, 0),
+ Duration::from_millis(100)
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Transient, 1),
+ Duration::from_millis(200)
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Throttling, 0),
+ Duration::from_secs(2)
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Throttling, 1),
+ Duration::from_secs(4)
+ );
+ }
+
+ #[test]
+ fn retry_backoff_is_capped() {
+ assert_eq!(
+ retry_backoff(RetryReason::Throttling, 2),
+ Duration::from_secs(8)
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Transient, 4),
+ Duration::from_millis(1_600)
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Transient, 8),
+ S3_RETRY_MAX_BACKOFF
+ );
+ // must not overflow
+ assert_eq!(
+ retry_backoff(RetryReason::Throttling, 64),
+ S3_RETRY_MAX_BACKOFF
+ );
+ assert_eq!(
+ retry_backoff(RetryReason::Transient, usize::MAX),
+ S3_RETRY_MAX_BACKOFF
+ );
+ }
+
struct TestDirectory(PathBuf);
impl Drop for TestDirectory {
--
2.47.3
next prev parent reply other threads:[~2026-11-16 9:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 9:54 [PATCH proxmox{,-backup} v5 00/12] fix #7606: verify: s3: handle transient fetch errors and add retry Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 01/12] s3-client: also retry requests on bad gateway responses Christian Ebner
2026-11-16 9:54 ` Christian Ebner [this message]
2026-11-16 9:54 ` [PATCH proxmox v5 03/12] s3-client: detect throttling request from the response body on error Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 04/12] s3-client: avoid retry bursts by adding jitter to retry backoff delay Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 05/12] s3-client: honor response header directed retry delays Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 06/12] s3-client: add additional backoff delay between upload retries Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 07/12] s3-client: add helper to fetch object contents with retry Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox v5 08/12] s3-client: add shared rate limiter based retry quota Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox-backup v5 09/12] s3: retry fetching object contents on body collection errors Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox-backup v5 10/12] datastore: snapshot: propagate errors in manifest update callback Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox-backup v5 11/12] fix #7606: verify: s3: handle transient chunk load errors Christian Ebner
2026-11-16 9:54 ` [PATCH proxmox-backup v5 12/12] verify: s3: stop early if the endpoint appears unreachable Christian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116095434.110541-3-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.