[PATCH proxmox-backup v8 03/13] datastore: have BackupGroup::destroy consume the group lock

[Hannes Laimer <h.laimer@proxmox.com>]

Take ownership of the group lock guard instead of acquiring it
internally, so callers that already hold the lock (e.g. the upcoming
move-group) can delegate final cleanup without a second lock attempt
and without duplicating the steps.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 pbs-datastore/src/backup_info.rs |  9 +++++----
 pbs-datastore/src/datastore.rs   | 10 ++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
index c33eb307..3f7f7c90 100644
--- a/pbs-datastore/src/backup_info.rs
+++ b/pbs-datastore/src/backup_info.rs
@@ -217,17 +217,18 @@ impl BackupGroup {
         crate::ListSnapshots::new(self.clone())
     }
 
-    /// Destroy the group inclusive all its backup snapshots (BackupDir's)
+    /// Destroy the group inclusive all its backup snapshots (BackupDir's).
+    ///
+    /// Consumes the group lock. The caller is responsible for acquiring it via
+    /// [`Self::lock`] beforehand.
     ///
     /// Returns `BackupGroupDeleteStats`, containing the number of deleted snapshots
     /// and number of protected snaphsots, which therefore were not removed.
     pub(crate) fn destroy(
         &self,
+        _lock_guard: BackupLockGuard,
         backend: &DatastoreBackend,
     ) -> Result<BackupGroupDeleteStats, Error> {
-        let _guard = self
-            .lock()
-            .with_context(|| format!("while destroying group '{self:?}'"))?;
         let path = self.full_group_path();
 
         log::info!("removing backup group {:?}", path);
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 5cdf6a4a..c1f2f8eb 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -1027,7 +1027,10 @@ impl DataStore {
         for group in self.iter_backup_groups(ns.to_owned())? {
             let group = group?;
             let backend = self.backend()?;
-            let delete_stats = group.destroy(&backend)?;
+            let guard = group
+                .lock()
+                .with_context(|| format!("while destroying group '{group:?}'"))?;
+            let delete_stats = group.destroy(guard, &backend)?;
             stats.add(&delete_stats);
             removed_all_groups = removed_all_groups && delete_stats.all_removed();
         }
@@ -1148,8 +1151,11 @@ impl DataStore {
         backup_group: &pbs_api_types::BackupGroup,
     ) -> Result<BackupGroupDeleteStats, Error> {
         let backup_group = self.backup_group(ns.clone(), backup_group.clone());
+        let guard = backup_group
+            .lock()
+            .with_context(|| format!("while destroying group '{backup_group:?}'"))?;
 
-        backup_group.destroy(&self.backend()?)
+        backup_group.destroy(guard, &self.backend()?)
     }
 
     /// Remove a backup directory including all content
-- 
2.47.3