From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 550561FF15C for ; Fri, 14 Nov 2025 14:18:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E25D13399; Fri, 14 Nov 2025 14:19:32 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 14 Nov 2025 14:18:53 +0100 Message-ID: <20251114131901.441650-14-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251114131901.441650-1-c.ebner@proxmox.com> References: <20251114131901.441650-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763126340126 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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 Subject: [pbs-devel] [PATCH proxmox-backup v6 13/21] GC: cleanup chunk markers from cache in phase 3 on s3 backends X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Pass along the in-memory cache when sweeping unused chunks in phase 3 of garbage collection for datastores with s3 backend. When a dangling marker file has been detected, which will only happen if the chunk was removed from the object store by some unexpected interaction (e.g. manually removed from the bucket), this marker must be removed to get a consistent state (snapshots referencing the chunk remain however corrupt). Clear such a chunk from both, the in-memory and local datastore cache, so it can be reuploaded by future backup or sync jobs. Signed-off-by: Christian Ebner --- pbs-datastore/src/chunk_store.rs | 22 +++++++++++++++++++++- pbs-datastore/src/datastore.rs | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index f5a77276d..20f71efef 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -5,6 +5,7 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use anyhow::{bail, format_err, Context, Error}; +use hex::FromHex; use tracing::{info, warn}; use pbs_api_types::{DatastoreFSyncLevel, GarbageCollectionStatus}; @@ -22,7 +23,7 @@ use crate::data_blob::DataChunkBuilder; use crate::file_formats::{ COMPRESSED_BLOB_MAGIC_1_0, ENCRYPTED_BLOB_MAGIC_1_0, UNCOMPRESSED_BLOB_MAGIC_1_0, }; -use crate::DataBlob; +use crate::{DataBlob, LocalDatastoreLruCache}; /// File system based chunk store pub struct ChunkStore { @@ -383,6 +384,7 @@ impl ChunkStore { min_atime: i64, status: &mut GarbageCollectionStatus, worker: &dyn WorkerTaskContext, + cache: Option<&LocalDatastoreLruCache>, ) -> Result<(), Error> { // unwrap: only `None` in unit tests assert!(self.locker.is_some()); @@ -436,6 +438,24 @@ impl ChunkStore { bad, status, || { + // non-bad S3 chunks need to be removed via cache + if let Some(cache) = cache { + if !bad { + let digest = <[u8; 32]>::from_hex(filename.to_bytes())?; + + // unless there is a concurrent upload pending, + // must never block due to required locking order + if let Ok(_guard) = + self.lock_chunk(&digest, Duration::from_secs(0)) + { + cache.remove(&digest)?; + } + + return Ok(()); + } + } + + // bad or local chunks unlinkat(Some(dirfd), filename, UnlinkatFlags::NoRemoveDir).map_err( |err| { format_err!( diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index ff8517e45..083a83f7d 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1755,6 +1755,7 @@ impl DataStore { min_atime, &mut tmp_gc_status, worker, + self.cache(), )?; } else { self.inner.chunk_store.sweep_unused_chunks( @@ -1762,6 +1763,7 @@ impl DataStore { min_atime, &mut gc_status, worker, + None, )?; } -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel