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 5E09E1FF179 for ; Wed, 26 Nov 2025 14:34:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD4BEC2FD; Wed, 26 Nov 2025 14:34:34 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 26 Nov 2025 14:34:19 +0100 Message-ID: <20251126133419.570874-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251126133419.570874-1-c.ebner@proxmox.com> References: <20251126133419.570874-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1764164034660 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 4/4] chunk store: return chunk extension and check for used marker 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" Clearly distinguish the cases for `bad` and `using` extensions for items returned by the chunk iterator. Directory entries with filenames which matched the expected length but not the extension are now skipped over. Signed-off-by: Christian Ebner --- pbs-datastore/src/chunk_store.rs | 48 ++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 7980938ad..ad517391d 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -280,7 +280,11 @@ impl ChunkStore { &self, ) -> Result< impl std::iter::FusedIterator< - Item = (Result, usize, bool), + Item = ( + Result, + usize, + ChunkExt, + ), >, Error, > { @@ -318,14 +322,20 @@ impl ChunkStore { if bytes.len() == 64 && bytes.iter().take(64).all(u8::is_ascii_hexdigit) { - return Some((Ok(entry), percentage, false)); + return Some((Ok(entry), percentage, ChunkExt::None)); } if bytes.len() == 64 + ".0.bad".len() && bytes.iter().take(64).all(u8::is_ascii_hexdigit) { - let bad = bytes.ends_with(b".bad"); - return Some((Ok(entry), percentage, bad)); + let chunk_ext = if bytes.ends_with(b".bad") { + ChunkExt::Bad + } else if bytes.ends_with(USING_MARKER_FILENAME_EXT.as_bytes()) { + ChunkExt::UsedMarker + } else { + continue; + }; + return Some((Ok(entry), percentage, chunk_ext)); } continue; @@ -334,7 +344,7 @@ impl ChunkStore { // stop after first error done = true; // and pass the error through: - return Some((Err(err), percentage, false)); + return Some((Err(err), percentage, ChunkExt::None)); } None => (), // open next directory } @@ -367,7 +377,7 @@ impl ChunkStore { return Some(( Err(format_err!("unable to read subdir '{subdir}' - {err}")), percentage, - false, + ChunkExt::None, )); } } @@ -402,7 +412,8 @@ impl ChunkStore { let mut last_percentage = 0; let mut chunk_count = 0; - for (entry, percentage, bad) in self.get_chunk_store_iterator()? { + for (entry, percentage, chunk_ext) in self.get_chunk_store_iterator()? { + let bad = chunk_ext.is_bad(); if last_percentage != percentage { last_percentage = percentage; info!("processed {percentage}% ({chunk_count} chunks)"); @@ -433,10 +444,7 @@ impl ChunkStore { drop(lock); continue; } - if filename - .to_bytes() - .ends_with(USING_MARKER_FILENAME_EXT.as_bytes()) - { + if chunk_ext.is_used_marker() { unlinkat(Some(dirfd), filename, UnlinkatFlags::NoRemoveDir).map_err(|err| { format_err!("unlinking chunk using marker {filename:?} failed - {err}") })?; @@ -908,6 +916,24 @@ impl ChunkStore { } } +#[derive(PartialEq)] +/// Chunk iterator directory entry filename extension +enum ChunkExt { + None, + Bad, + UsedMarker, +} + +impl ChunkExt { + fn is_bad(&self) -> bool { + *self == Self::Bad + } + + fn is_used_marker(&self) -> bool { + *self == Self::UsedMarker + } +} + #[test] fn test_chunk_store1() { let mut path = std::fs::canonicalize(".").unwrap(); // we need absolute path -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel