From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v5 05/19] fix #6961: datastore: verify: evict corrupt chunks from in-memory LRU cache
Date: Tue, 11 Nov 2025 15:29:48 +0100 [thread overview]
Message-ID: <20251111143002.759901-6-c.ebner@proxmox.com> (raw)
In-Reply-To: <20251111143002.759901-1-c.ebner@proxmox.com>
lock cache store on rename of fs backed datastores and additional
per-chunk file lock on s3 backend.
Chunks detected as corrupt have been renamed on both, the S3 backend
and the local datastore cache, but not evicted from the in-memory
cache containing the LRU chunk digests. This can lead to the chunks
being considered as already present if their digest is still cached,
and therefore not being re-inserted in the local store cache and S3
backend on backup upload.
Fix this by not only renaming the local datastore's chunk marker
file, but also removing it from the in-memory cache while holding the
chunk store mutex lock to exclude interference from concurrent chunk
inserts.
Reported-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=6961
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index a3c0f32aa..5680382cd 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -2618,6 +2618,11 @@ impl DataStore {
}
}
+ if let Some(cache) = self.cache() {
+ // Locks are being held, so it is safe to call the method
+ let _ = unsafe { cache.remove(digest) };
+ }
+
let result = match std::fs::rename(&path, &new_path) {
Ok(_) => Ok(Some(new_path)),
Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None),
--
2.47.3
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2025-11-11 14:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-11 14:29 [pbs-devel] [PATCH proxmox-backup v5 00/19] fix chunk upload/insert, rename corrupt chunks and GC race conditions for s3 backend Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 01/19] datastore: GC: drop overly verbose info message during s3 chunk sweep Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 02/19] chunk store: implement per-chunk file locking helper for s3 backend Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 03/19] datastore: acquire chunk store mutex lock when renaming corrupt chunk Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 04/19] datastore: get per-chunk file lock for chunk rename on s3 backend Christian Ebner
2025-11-11 14:29 ` Christian Ebner [this message]
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 06/19] datastore: add locking to protect against races on chunk insert for s3 Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 07/19] GC: fix race with chunk upload/insert on s3 backends Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 08/19] chunk store: reduce exposure of clear_chunk() to crate only Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 09/19] chunk store: make chunk removal a helper method of the chunk store Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 10/19] store: split insert_chunk into wrapper + unsafe locked implementation Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 11/19] store: cache: move Mutex acquire to cache insertion Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 12/19] chunk store: rename cache-specific helpers Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 13/19] GC: cleanup chunk markers from cache in phase 3 on s3 backends Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 14/19] GC: touch bad chunk files independent of backend type Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 15/19] GC: guard missing marker file insertion for s3 backed stores Christian Ebner
2025-11-11 14:29 ` [pbs-devel] [PATCH proxmox-backup v5 16/19] GC: s3: track if a chunk marker file is missing since a bad chunk Christian Ebner
2025-11-11 14:30 ` [pbs-devel] [PATCH proxmox-backup v5 17/19] chunk store: add helpers marking missing local chunk markers as expected Christian Ebner
2025-11-11 14:30 ` [pbs-devel] [PATCH proxmox-backup v5 18/19] GC: assure chunk exists on s3 store when creating missing chunk marker Christian Ebner
2025-11-11 14:30 ` [pbs-devel] [PATCH proxmox-backup v5 19/19] datastore: document s3 backend specific locking restrictions Christian Ebner
2025-11-14 13:21 ` [pbs-devel] superseded: [PATCH proxmox-backup v5 00/19] fix chunk upload/insert, rename corrupt chunks and GC race conditions for s3 backend 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=20251111143002.759901-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox