From: Shan Shaji <s.shaji@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 4/9] datastore: add method to create zero-byte chunk markers
Date: Mon, 19 Oct 2026 18:03:54 +0200 [thread overview]
Message-ID: <20261019160359.20851-5-s.shaji@proxmox.com> (raw)
In-Reply-To: <20261019160359.20851-1-s.shaji@proxmox.com>
previously, recreating an S3-backed datastore with the --reuse-datastore
flag fetched only the metadata files into the local cache, without
creating chunk markers. Garbage collection (GC) had to be run to
recreate markers for chunks referenced by the backup indexes.
In order to fix this, add method to create zero-byte chunk markers by
listing the chunk objects in S3 when reusing a datastore.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
pbs-datastore/src/datastore.rs | 50 ++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 7bb0c187c..17fa47cc3 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -13,6 +13,7 @@ use hyper::Method;
use hyper::body::Bytes;
use nix::unistd::{UnlinkatFlags, unlinkat};
use pbs_tools::lru_cache::LruCache;
+use proxmox_log::log_throttle::{self, LogThrottle};
use tokio::io::AsyncWriteExt;
use tracing::{info, warn};
@@ -3292,6 +3293,55 @@ impl DataStore {
*OLD_LOCKING
}
+ /// The caller must hold the maintenance-mode lock with the datastore in
+ /// `S3Refresh` mode.
+ pub fn create_empty_s3_chunk_markers(
+ &self,
+ worker: &dyn WorkerTaskContext,
+ ) -> Result<(), Error> {
+ let DatastoreBackend::S3(s3_client) = self.backend()? else {
+ bail!("store '{}' not backed by S3", self.name());
+ };
+
+ let start = std::time::Instant::now();
+
+ // Holding the chunk store lock for the whole time here is
+ // only acceptable since the maintenance mode lock is held
+ // during the entire datastore creation.
+ let _guard = self.inner.chunk_store.mutex().lock().unwrap();
+
+ let mut chunk_marker_count = 0;
+ let mut log_throttle =
+ LogThrottle::new(log_throttle::INITIAL_INTERVAL, log_throttle::MAX_INTERVAL);
+
+ self.paginate_s3_chunk_objects(
+ worker,
+ s3_client.as_ref(),
+ |chunk_store, object_key, _| -> Result<(), Error> {
+ let (_, digest, _) = match digest_from_object_key(&object_key) {
+ Some(result) => result,
+ None => return Ok(()),
+ };
+
+ unsafe {
+ chunk_store.replace_chunk_with_marker_or_create_marker(&digest)?;
+ }
+
+ chunk_marker_count += 1;
+ if log_throttle.should_log() {
+ info!("created {chunk_marker_count} chunk markers");
+ }
+
+ Ok(())
+ },
+ )?;
+
+ let elapsed = TimeSpan::from(start.elapsed());
+ info!("created {chunk_marker_count} chunk markers in {elapsed}");
+
+ Ok(())
+ }
+
/// Fetch contents from S3 object store, clear and replace the local cache store contents.
/// Returns with error for non-S3 datastore backends.
pub async fn s3_refresh(self: &Arc<Self>) -> Result<(), Error> {
--
2.47.3
next prev parent reply other threads:[~2026-10-19 16:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 16:03 [PATCH proxmox{-backup,} 0/9] fix #7903: rebuild local S3 chunk markers Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 1/9] refactor: remove local `LogThrottle` in favor of proxmox-log Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 2/9] datastore: factor out s3 chunk objects pagination into a helper Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 3/9] pbs-datastore: inherit proxmox-log crate from workspace Shan Shaji
2026-10-19 16:03 ` Shan Shaji [this message]
2026-10-19 16:03 ` [PATCH proxmox-backup 5/9] fix #7908: datastore: api: add option to create zero-byte chunk markers Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 6/9] fix #7908: datastore: ui: " Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 7/9] fix #7908: backup-manager: " Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox-backup 8/9] docs: add explanation regarding ``rebuild-chunk-markers`` option Shan Shaji
2026-10-19 16:03 ` [PATCH proxmox 9/9] proxmox-log: add LogThrottle implementation Shan Shaji
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=20261019160359.20851-5-s.shaji@proxmox.com \
--to=s.shaji@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox