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 00DEB1FF15E for ; Mon, 24 Nov 2025 10:40:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BD201D1BF; Mon, 24 Nov 2025 10:40:39 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 24 Nov 2025 10:40:17 +0100 Message-ID: <20251124094018.224661-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251124094018.224661-1-c.ebner@proxmox.com> References: <20251124094018.224661-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763977200875 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 v2 3/4] chunk store: clarify chunk marker helper creates marker if missing 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" Rename replace_chunk_with_marker() to replace_chunk_with_marker_or_create_marker() and adapt the docstring so it is clear that this also creates the marker if the chunk file is missing. Signed-off-by: Christian Ebner --- Changes since version 1: - not present pbs-datastore/src/chunk_store.rs | 8 ++++++-- pbs-datastore/src/datastore.rs | 4 +++- pbs-datastore/src/local_datastore_lru_cache.rs | 10 ++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 143848838..f53460664 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -716,10 +716,14 @@ impl ChunkStore { /// Replace a chunk file with a zero size file in the chunk store. /// /// Used to evict chunks from the local datastore cache, while keeping them as in-use markers - /// for garbage collection. Returns with success also if chunk file is not pre-existing. + /// for garbage collection. Returns with success also if chunk file is not pre-existing, + /// also creating the marker file in that case. /// /// Safety: chunk store mutex must be held! - pub(crate) unsafe fn replace_chunk_with_marker(&self, digest: &[u8; 32]) -> Result<(), Error> { + pub(crate) unsafe fn replace_chunk_with_marker_or_create_marker( + &self, + digest: &[u8; 32], + ) -> Result<(), Error> { let (chunk_path, digest_str) = self.chunk_path(digest); Self::create_marker_file(&chunk_path) .map_err(|err| format_err!("clear chunk failed for {digest_str} - {err}"))?; diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 1b489b449..d88785c6d 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1714,7 +1714,9 @@ impl DataStore { if self.inner.chunk_store.clear_chunk_expected_mark(&digest)? { unsafe { // chunk store lock held - self.inner.chunk_store.replace_chunk_with_marker(&digest)?; + self.inner + .chunk_store + .replace_chunk_with_marker_or_create_marker(&digest)?; } Some(SystemTime::now()) } else { diff --git a/pbs-datastore/src/local_datastore_lru_cache.rs b/pbs-datastore/src/local_datastore_lru_cache.rs index ae2215be1..f39b26ebb 100644 --- a/pbs-datastore/src/local_datastore_lru_cache.rs +++ b/pbs-datastore/src/local_datastore_lru_cache.rs @@ -42,7 +42,10 @@ impl LocalDatastoreLruCache { } self.cache.insert(*digest, (), |digest| { // Safety: lock acquired above, this is executed inline! - unsafe { self.store.replace_chunk_with_marker(&digest) } + unsafe { + self.store + .replace_chunk_with_marker_or_create_marker(&digest) + } }) } @@ -80,7 +83,10 @@ impl LocalDatastoreLruCache { let _lock = self.store.mutex().lock().unwrap(); self.cache.insert(*digest, (), |digest| { // Safety: lock acquired above, this is executed inline - unsafe { self.store.replace_chunk_with_marker(&digest) } + unsafe { + self.store + .replace_chunk_with_marker_or_create_marker(&digest) + } })?; Ok(Some(chunk)) } -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel