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 7356D1FF183 for ; Wed, 8 Oct 2025 17:22:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12811C52F; Wed, 8 Oct 2025 17:22:14 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 8 Oct 2025 17:21:22 +0200 Message-ID: <20251008152125.849216-10-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251008152125.849216-1-c.ebner@proxmox.com> References: <20251008152125.849216-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1759936868154 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 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 09/12] chunk store: refactor method for chunk insertion 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" Extend the current implementation of the chunk insertion by a method to provide a callback to be executed before writing the chunk file, but after checking if the file is pre-existing. This is in preparation for different methods for chunk insertion, with differentiated handling of the non pre-existing chunk file case. Signed-off-by: Christian Ebner --- pbs-datastore/src/chunk_store.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 6e50327cb..65d74d68e 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -558,6 +558,15 @@ impl ChunkStore { } pub fn insert_chunk(&self, chunk: &DataBlob, digest: &[u8; 32]) -> Result<(bool, u64), Error> { + self.insert_chunk_impl(chunk, digest, |_, _| Ok(())) + } + + fn insert_chunk_impl( + &self, + chunk: &DataBlob, + digest: &[u8; 32], + before_create: impl FnOnce(&[u8; 32], bool) -> Result<(), Error>, + ) -> Result<(bool, u64), Error> { // unwrap: only `None` in unit tests assert!(self.locker.is_some()); @@ -572,7 +581,7 @@ impl ChunkStore { let name = &self.name; - if let Ok(metadata) = std::fs::metadata(&chunk_path) { + let pre_existing = if let Ok(metadata) = std::fs::metadata(&chunk_path) { if !metadata.is_file() { bail!("got unexpected file type on store '{name}' for chunk {digest_str}"); } @@ -612,7 +621,12 @@ impl ChunkStore { } else { log::debug!("Got another copy of chunk with digest '{digest_str}', existing chunk is bigger, replacing with uploaded one."); } - } + true + } else { + false + }; + + before_create(digest, pre_existing)?; let chunk_dir_path = chunk_path .parent() -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel