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 183D91FF17E for ; Thu, 11 Dec 2025 16:38:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70FB11A540; Thu, 11 Dec 2025 16:39:27 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 11 Dec 2025 16:38:34 +0100 Message-ID: <20251211153835.180405-8-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251211153835.180405-1-c.ebner@proxmox.com> References: <20251211153835.180405-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1765467531441 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 7/8] chunk store: move next bad chunk path generator into dedicated helper 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" Better encapsulate the logic as this concerns the chunk store and perpare for placing the logic on bad chunk filename generation into a single place. Signed-off-by: Christian Ebner --- pbs-datastore/src/chunk_store.rs | 16 ++++++++++++++++ pbs-datastore/src/datastore.rs | 11 +---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 2ad90757a..f5585d2cb 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -915,6 +915,22 @@ impl ChunkStore { })?; Ok(guard) } + + /// Generate the next bad chunk file path for given digest. Returns the path as well as the bad + /// chunk counter. + pub(crate) fn next_bad_chunk_path(&self, digest: &[u8; 32]) -> (PathBuf, usize) { + let (mut chunk_path, digest_str) = self.chunk_path(digest); + let mut counter = 0; + loop { + chunk_path.set_file_name(format!("{digest_str}.{counter}.bad")); + if chunk_path.exists() && counter < 9 { + counter += 1; + } else { + break; + } + } + (chunk_path, counter) + } } #[derive(PartialEq)] diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 2bab20294..f24a3a056 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -2652,16 +2652,7 @@ impl DataStore { } let _lock = self.inner.chunk_store.mutex().lock().unwrap(); - let mut counter = 0; - let mut new_path = path.clone(); - loop { - new_path.set_file_name(format!("{digest_str}.{counter}.bad")); - if new_path.exists() && counter < 9 { - counter += 1; - } else { - break; - } - } + let (new_path, counter) = self.inner.chunk_store.next_bad_chunk_path(digest); let result = match std::fs::rename(&path, &new_path) { Ok(_) => Ok(Some(new_path)), -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel