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 0F4B11FF165 for ; Thu, 3 Jul 2025 15:19:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9B54614A27; Thu, 3 Jul 2025 15:20:16 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 3 Jul 2025 15:18:18 +0200 Message-ID: <20250703131837.786811-31-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250703131837.786811-1-c.ebner@proxmox.com> References: <20250703131837.786811-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 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 v5 27/46] datastore: create/delete protected marker file on s3 storage backend 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" Commit 8292d3d2 ("api2/admin/datastore: add get/set_protection") introduced the protected flag for backup snapshots, considering snapshots as protected based on the presence/absence of the `.protected` marker file in the corresponding snapshot directory. To allow independent recovery of a datastore backed by an S3 bucket, also create/delete the marker file on the object store backend. For actual checks, still rely on the marker as encountered in the local cache store. Signed-off-by: Christian Ebner --- pbs-datastore/src/datastore.rs | 37 +++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 89e85dbea..e83941bfe 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1558,12 +1558,39 @@ impl DataStore { let protected_path = backup_dir.protected_file(); if protection { - std::fs::File::create(protected_path) + std::fs::File::create(&protected_path) .map_err(|err| format_err!("could not create protection file: {}", err))?; - } else if let Err(err) = std::fs::remove_file(protected_path) { - // ignore error for non-existing file - if err.kind() != std::io::ErrorKind::NotFound { - bail!("could not remove protection file: {}", err); + if let DatastoreBackend::S3(s3_client) = self.backend()? { + let marker = backup_dir.relative_path().join(".protected"); + let protected_marker = marker + .to_str() + .ok_or_else(|| format_err!("unexpected protected marker path"))?; + let _is_duplicate = proxmox_async::runtime::block_on(s3_client.upload_with_retry( + protected_marker.into(), + hyper::body::Bytes::from(""), + false, + )) + .context("failed to mark snapshot as protected on s3 backend")?; + } + } else { + if let Err(err) = std::fs::remove_file(&protected_path) { + // ignore error for non-existing file + if err.kind() != std::io::ErrorKind::NotFound { + bail!("could not remove protection file: {err}"); + } + } + if let DatastoreBackend::S3(s3_client) = self.backend()? { + let marker = backup_dir.relative_path().join(".protected"); + let protected_marker = marker + .to_str() + .ok_or_else(|| format_err!("unexpected protected marker path"))?; + if let Err(err) = proxmox_async::runtime::block_on( + s3_client.delete_object(protected_marker.into()), + ) { + std::fs::File::create(&protected_path) + .map_err(|err| format_err!("could not re-create protection file: {err}"))?; + return Err(err); + } } } -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel