From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 2/2] verify: s3: retry on transient response body collection errors
Date: Thu, 3 Sep 2026 14:15:57 +0200 [thread overview]
Message-ID: <20260903121557.420018-3-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260903121557.420018-1-c.ebner@proxmox.com>
If collecting the response body for the S3 object fetching requests
fail, retry with exponential backoff time and only consider this
as transient fetch error on retry exhaustion. Sending the requests
is already retried by the s3-client, so not to be repeated.
This avoids that an otherwise long running verification which already
downloaded a lot of chunks needs to be redone due to transient
connection issues.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
src/backup/verify.rs | 94 ++++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 39 deletions(-)
diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index e85e120e5..b558bcaf1 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -2,7 +2,7 @@ use pbs_config::BackupLockGuard;
use std::collections::HashSet;
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
use std::sync::{Arc, Mutex};
-use std::time::Instant;
+use std::time::{Duration, Instant};
use anyhow::{Error, format_err};
use http_body_util::BodyExt;
@@ -305,48 +305,64 @@ impl VerifyWorker {
},
DatastoreBackend::S3(s3_client) => {
let object_key = pbs_datastore::s3::object_key_from_digest(&info.digest)?;
- match proxmox_async::runtime::block_on(s3_client.get_object(object_key)) {
- Ok(Some(response)) => {
- match proxmox_async::runtime::block_on(response.content.collect()) {
- Ok(raw_chunk) => {
- match DataBlob::from_raw(raw_chunk.to_bytes().to_vec()) {
- Ok(chunk) => {
- let size = info.size();
- verify_state
- .read_bytes
- .fetch_add(chunk.raw_size(), Ordering::SeqCst);
- decoder_pool.send((chunk, info.digest, size))?;
- verify_state
- .decoded_bytes
- .fetch_add(size, Ordering::SeqCst);
- }
- Err(err) => Self::add_corrupt_chunk(
- verify_state,
- info.digest,
- &format!(
- "can't verify chunk with digest {} - {err}",
- hex::encode(info.digest)
+
+ for retry in 0..3 {
+ let verify_state = Arc::clone(&verify_state);
+ match proxmox_async::runtime::block_on(s3_client.get_object(object_key.clone()))
+ {
+ Ok(Some(response)) => {
+ match proxmox_async::runtime::block_on(response.content.collect()) {
+ Ok(raw_chunk) => {
+ match DataBlob::from_raw(raw_chunk.to_bytes().to_vec()) {
+ Ok(chunk) => {
+ let size = info.size();
+ verify_state
+ .read_bytes
+ .fetch_add(chunk.raw_size(), Ordering::SeqCst);
+ decoder_pool.send((chunk, info.digest, size))?;
+ verify_state
+ .decoded_bytes
+ .fetch_add(size, Ordering::SeqCst);
+ }
+ Err(err) => Self::add_corrupt_chunk(
+ verify_state,
+ info.digest,
+ &format!(
+ "can't verify chunk with digest {} - {err}",
+ hex::encode(info.digest)
+ ),
),
- ),
+ }
+ break;
+ }
+ Err(err) => {
+ if retry < 3 {
+ warn!("retry reading chunk, load failed - {err}");
+ let backoff = Duration::from_secs(3_u64.pow(retry));
+ std::thread::sleep(backoff);
+ } else {
+ verify_state.fetch_errors.fetch_add(1, Ordering::SeqCst);
+ error!("can't verify chunk, load failed - {err}");
+ }
}
- }
- Err(err) => {
- verify_state.fetch_errors.fetch_add(1, Ordering::SeqCst);
- error!("can't verify chunk, load failed - {err}");
}
}
- }
- Ok(None) => Self::add_corrupt_chunk(
- verify_state,
- info.digest,
- &format!(
- "can't verify missing chunk with digest {}",
- hex::encode(info.digest)
- ),
- ),
- Err(err) => {
- verify_state.fetch_errors.fetch_add(1, Ordering::SeqCst);
- error!("can't verify chunk, load failed - {err}");
+ Ok(None) => {
+ Self::add_corrupt_chunk(
+ verify_state,
+ info.digest,
+ &format!(
+ "can't verify missing chunk with digest {}",
+ hex::encode(info.digest)
+ ),
+ );
+ break;
+ }
+ Err(err) => {
+ verify_state.fetch_errors.fetch_add(1, Ordering::SeqCst);
+ error!("can't verify chunk, load failed - {err}");
+ break;
+ }
}
}
}
--
2.47.3
prev parent reply other threads:[~2026-09-03 12:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 12:15 [PATCH proxmox-backup 0/2] fix #7606: verify: s3: handle transient fetch errors and add retry Christian Ebner
2026-09-03 12:15 ` [PATCH proxmox-backup 1/2] fix #7606: verify: s3: handle transient chunk load errors Christian Ebner
2026-09-03 12:15 ` Christian Ebner [this message]
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=20260903121557.420018-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.