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 124771FF185 for ; Mon, 23 Jun 2025 11:41:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 64E03D267; Mon, 23 Jun 2025 11:41:56 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 23 Jun 2025 11:40:24 +0200 Message-ID: <20250623094106.299251-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250623094106.299251-1-c.ebner@proxmox.com> References: <20250623094106.299251-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.036 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 v4 03/45] datastore: ignore missing owner file when removing group directory 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" Since commit 23be00a4 ("fix #3336: datastore: remove group if the last snapshot is removed"), a backup group directory is cleaned up when the new locking mechanism is in use once: - the group is requested to be destroyed and all the snapshots have been deleted - the last snapshot of a group has been destroyed Since then, the owner file is also cleaned up separately. However, the owner file might be already missing due to removal of the group directory executed when removing the last backup snapshot of the group, making the subsequent call in the backup group destroy method fail. Fix this by ignoring a missing owner file and continue with trying to emove the group directory itself. Fixes: 23be00a4 ("fix #3336: datastore: remove group if the last snapshot is removed") Signed-off-by: Christian Ebner --- pbs-datastore/src/backup_info.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 83cd0088d..e3ecd437f 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -257,9 +257,11 @@ impl BackupGroup { let owner_path = self.store.owner_path(&self.ns, &self.group); - std::fs::remove_file(&owner_path).map_err(|err| { - format_err!("removing the owner file '{owner_path:?}' failed - {err}") - })?; + if let Err(err) = std::fs::remove_file(&owner_path) { + if err.kind() != std::io::ErrorKind::NotFound { + bail!("removing the owner file '{owner_path:?}' failed - {err}"); + } + } let path = self.full_group_path(); -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel