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 E2E271FF13B for ; Tue, 13 Jan 2026 11:24:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 91A3F1438C; Tue, 13 Jan 2026 11:24:49 +0100 (CET) Date: Tue, 13 Jan 2026 11:24:43 +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-7-c.ebner@proxmox.com> In-Reply-To: <20251211153835.180405-7-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1768299428.y7nb6yy6cx.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768299841947 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 6/8] datastore: move bad chunk touching logic to chunk store 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: > Provide an dedicated method and encapsulate the bad chunk filename > generation and access time updates. This is an implementation detail > of the chunks store, the garbage collection should not be concerned > about this. > > In preparation for making the bad filename generation a dedicated > helper as well, all contained within the chunk store module. > > Signed-off-by: Christian Ebner > --- > pbs-datastore/src/chunk_store.rs | 15 +++++++++++++++ > pbs-datastore/src/datastore.rs | 11 +---------- > 2 files changed, 16 insertions(+), 10 deletions(-) > > diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs > index e05e67dfe..2ad90757a 100644 > --- a/pbs-datastore/src/chunk_store.rs > +++ b/pbs-datastore/src/chunk_store.rs > @@ -276,6 +276,21 @@ impl ChunkStore { > Ok(true) > } > > + /// Update access timestamp on all bad chunks for given digest > + pub(super) fn cond_touch_bad_chunks(&self, digest: &[u8; 32]) -> Result { please document the locking semantics for this new interface! AFAICT, this is only called once next to calls to cond_touch_chunk which obtain the chunk store Mutex, so should this also do so? > + let (chunk_path, _digest_str) = self.chunk_path(digest); > + let mut is_bad = false; > + for i in 0..=9 { > + let bad_ext = format!("{i}.bad"); > + let mut bad_path = chunk_path.clone(); > + bad_path.set_extension(bad_ext); > + if self.cond_touch_path(&bad_path, false)? { > + is_bad = true; > + } > + } > + Ok(is_bad) > + } > + > fn get_chunk_store_iterator( > &self, > ) -> Result< > diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs > index 58fd034fc..2bab20294 100644 > --- a/pbs-datastore/src/datastore.rs > +++ b/pbs-datastore/src/datastore.rs > @@ -1355,19 +1355,10 @@ impl DataStore { > } > > if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { > - let (chunk_path, _digest_str) = self.chunk_path(digest); > // touch any corresponding .bad files to keep them around, meaning if a chunk is > // rewritten correctly they will be removed automatically, as well as if no index > // file requires the chunk anymore (won't get to this loop then) > - let mut is_bad = false; > - for i in 0..=9 { > - let bad_ext = format!("{i}.bad"); > - let mut bad_path = chunk_path.clone(); > - bad_path.set_extension(bad_ext); > - if self.inner.chunk_store.cond_touch_path(&bad_path, false)? { this was the last call to cond_touch_path outside of chunk_store.rs , which means we can make it private now (which was part of the point of this series ;)). > - is_bad = true; > - } > - } > + let is_bad = self.inner.chunk_store.cond_touch_bad_chunks(digest)?; > > if let Some(ref _s3_client) = s3_client { > // Do not retry here, this is very unlikely to happen as chunk markers will > -- > 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