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 7DFDD1FF15C for ; Fri, 14 Nov 2025 14:19:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 945A4136BC; Fri, 14 Nov 2025 14:20:04 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 14 Nov 2025 14:18:54 +0100 Message-ID: <20251114131901.441650-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251114131901.441650-1-c.ebner@proxmox.com> References: <20251114131901.441650-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763126340355 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 v6 14/21] GC: touch bad chunk files independent of backend type 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" The bad chunks marker files should be kept around also for s3 backed datastores so GC does not clean them up unless a good chunk was re-uploaded and bad chunk renaming detects them and does not lead to conflicting renames. Signed-off-by: Christian Ebner --- pbs-datastore/src/datastore.rs | 64 ++++++++++++++++------------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 083a83f7d..d71106ea8 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1322,41 +1322,37 @@ impl DataStore { } } - match s3_client { - None => { - // Filesystem backend - if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { - let hex = hex::encode(digest); - warn!( - "warning: unable to access non-existent chunk {hex}, required by {file_name:?}" - ); - - // 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) - for i in 0..=9 { - let bad_ext = format!("{i}.bad"); - let mut bad_path = PathBuf::new(); - bad_path.push(self.chunk_path(digest).0); - bad_path.set_extension(bad_ext); - self.inner.chunk_store.cond_touch_path(&bad_path, false)?; - } - } + if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { + let hex = hex::encode(digest); + warn!( + "warning: unable to access non-existent chunk {hex}, required by {file_name:?}" + ); + + // 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) + for i in 0..=9 { + let bad_ext = format!("{i}.bad"); + let mut bad_path = PathBuf::new(); + bad_path.push(self.chunk_path(digest).0); + bad_path.set_extension(bad_ext); + self.inner.chunk_store.cond_touch_path(&bad_path, false)?; } - Some(ref _s3_client) => { - // Update atime on local cache marker files. - if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { - let (chunk_path, _digest) = self.chunk_path(digest); - // Insert empty file as marker to tell GC phase2 that this is - // a chunk still in-use, so to keep in the S3 object store. - std::fs::File::options() - .write(true) - .create_new(true) - .open(&chunk_path) - .with_context(|| { - format!("failed to create marker for chunk {}", hex::encode(digest)) - })?; - } + } + + if let Some(ref _s3_client) = s3_client { + // Update atime on local cache marker files. + if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { + let (chunk_path, _digest) = self.chunk_path(digest); + // Insert empty file as marker to tell GC phase2 that this is + // a chunk still in-use, so to keep in the S3 object store. + std::fs::File::options() + .write(true) + .create_new(true) + .open(&chunk_path) + .with_context(|| { + format!("failed to create marker for chunk {}", hex::encode(digest)) + })?; } } } -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel