From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7E5561FF13B for ; Tue, 13 Jan 2026 11:24:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82DB514268; Tue, 13 Jan 2026 11:24:29 +0100 (CET) Date: Tue, 13 Jan 2026 11:23:52 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20251211153835.180405-1-c.ebner@proxmox.com> <20251211153835.180405-4-c.ebner@proxmox.com> In-Reply-To: <20251211153835.180405-4-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1768297033.j3cp7p57tw.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768299790835 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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: Re: [pbs-devel] [PATCH proxmox-backup v2 3/8] chunk store: invert chunk filename checks in chunk store iterator 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" On December 11, 2025 4:38 pm, Christian Ebner wrote: > Optimizes the chunk filename check towards regular chunk files by > explicitley checking for the correct length. > > While the check for ascii hexdigits needs to be stated twice, this > avoids to check for the `.bad` extension if the chunk filename did > already match the expected length. I don't get this part, we could still check first and only once that the first 64 bytes are valid hex? if bytes.len() < 64 { continue; } if !bytes.iter().take(64).all(u8::is_ascii_hexdigit) { continue; } // now start looking at the length + potential extension > > This will also help to better distinguish bad chunks and chunks > used markers for s3 datastores in subsequent changes. > > Signed-off-by: Christian Ebner > --- > pbs-datastore/src/chunk_store.rs | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs > index a5e5f6261..7980938ad 100644 > --- a/pbs-datastore/src/chunk_store.rs > +++ b/pbs-datastore/src/chunk_store.rs > @@ -315,15 +315,20 @@ impl ChunkStore { > Some(Ok(entry)) => { > // skip files if they're not a hash > let bytes = entry.file_name().to_bytes(); > - if bytes.len() != 64 && bytes.len() != 64 + ".0.bad".len() { > - continue; > + > + if bytes.len() == 64 && bytes.iter().take(64).all(u8::is_ascii_hexdigit) > + { > + return Some((Ok(entry), percentage, false)); > } > - if !bytes.iter().take(64).all(u8::is_ascii_hexdigit) { > - continue; > + > + 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)); while this mimics the old code, it is still broken (a chunk digest + .fooba or any other 6-byte suffix that is not "??.bad" is returned as non-bad chunk, since the length matches a bad chunk, but the extension does not). > } > > - let bad = bytes.ends_with(b".bad"); > - return Some((Ok(entry), percentage, bad)); > + continue; > } > Some(Err(err)) => { > // stop after first error > -- > 2.47.3 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel