From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9428A68713 for ; Wed, 9 Mar 2022 14:51:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 89E03503 for ; Wed, 9 Mar 2022 14:50:51 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8B1E04F6 for ; Wed, 9 Mar 2022 14:50:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5FDAF45880 for ; Wed, 9 Mar 2022 14:50:49 +0100 (CET) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Wed, 9 Mar 2022 14:50:31 +0100 Message-Id: <20220309135031.1995207-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] fix #3336: api: remove backup group if the last snapshot is removed 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: , X-List-Received-Date: Wed, 09 Mar 2022 13:51:21 -0000 Signed-off-by: Stefan Sterz --- pbs-datastore/src/datastore.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index d416c8d8..623b7688 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -346,6 +346,28 @@ impl DataStore { ) })?; + // check if this was the last snapshot and if so remove the group + if backup_dir + .group() + .list_backups(&self.base_path())? + .is_empty() + { + let group_path = self.group_path(backup_dir.group()); + let _guard = proxmox_sys::fs::lock_dir_noblock( + &group_path, + "backup group", + "possible running backup", + )?; + + std::fs::remove_dir_all(&group_path).map_err(|err| { + format_err!( + "removing backup group directory {:?} failed - {}", + group_path, + err, + ) + })?; + } + // the manifest does not exists anymore, we do not need to keep the lock if let Ok(path) = self.manifest_lock_path(backup_dir) { // ignore errors -- 2.30.2