datastore: move update_manifest into BackupDir impl

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

pbs-datastore/src/backup_info.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use anyhow::{bail, format_err, Error};
 
-use proxmox_sys::fs::lock_dir_noblock;
+use proxmox_sys::fs::{lock_dir_noblock, replace_file, CreateOptions};
 
 use pbs_api_types::{
     Authid, BackupNamespace, BackupType, GroupFilter, BACKUP_DATE_REGEX, BACKUP_FILE_REGEX,
@@ -493,7 +493,22 @@ impl BackupDir {
         &self,
         update_fn: impl FnOnce(&mut BackupManifest),
     ) -> Result<(), Error> {
-        self.store.update_manifest(self, update_fn)
+        let _guard = self.lock_manifest()?;
+        let (mut manifest, _) = self.load_manifest()?;
+
+        update_fn(&mut manifest);
+
+        let manifest = serde_json::to_value(manifest)?;
+        let manifest = serde_json::to_string_pretty(&manifest)?;
+        let blob = DataBlob::encode(manifest.as_bytes(), None, true)?;
+        let raw_data = blob.raw_data();
+
+        let mut path = self.full_path();
+        path.push(MANIFEST_BLOB_NAME);
+
+        // atomic replace invalidates flock - no other writes past this point!
+        replace_file(&path, raw_data, CreateOptions::new(), false)?;
+        Ok(())
     }
 
     /// Cleans up the backup directory by removing any file not mentioned in the manifest.

pbs-datastore/src/datastore.rs

@@ -28,7 +28,7 @@ use crate::chunk_store::ChunkStore;
 use crate::dynamic_index::{DynamicIndexReader, DynamicIndexWriter};
 use crate::fixed_index::{FixedIndexReader, FixedIndexWriter};
 use crate::index::IndexFile;
-use crate::manifest::{archive_type, ArchiveType, BackupManifest, MANIFEST_BLOB_NAME};
+use crate::manifest::{archive_type, ArchiveType};
 use crate::task_tracking::update_active_operations;
 use crate::DataBlob;
 
@@ -1098,37 +1098,6 @@ impl DataStore {
         })
     }
 
-    /// Load the manifest without a lock. Must not be written back.
-    pub fn load_manifest(&self, backup_dir: &BackupDir) -> Result<(BackupManifest, u64), Error> {
-        backup_dir.load_manifest()
-    }
-
-    /// Update the manifest of the specified snapshot. Never write a manifest directly,
-    /// only use this method - anything else may break locking guarantees.
-    pub fn update_manifest(
-        &self,
-        backup_dir: &BackupDir,
-        update_fn: impl FnOnce(&mut BackupManifest),
-    ) -> Result<(), Error> {
-        let _guard = backup_dir.lock_manifest()?;
-        let (mut manifest, _) = self.load_manifest(backup_dir)?;
-
-        update_fn(&mut manifest);
-
-        let manifest = serde_json::to_value(manifest)?;
-        let manifest = serde_json::to_string_pretty(&manifest)?;
-        let blob = DataBlob::encode(manifest.as_bytes(), None, true)?;
-        let raw_data = blob.raw_data();
-
-        let mut path = backup_dir.full_path();
-        path.push(MANIFEST_BLOB_NAME);
-
-        // atomic replace invalidates flock - no other writes past this point!
-        replace_file(&path, raw_data, CreateOptions::new(), false)?;
-
-        Ok(())
-    }
-
     /// Updates the protection status of the specified snapshot.
     pub fn update_protection(&self, backup_dir: &BackupDir, protection: bool) -> Result<(), Error> {
         let full_path = backup_dir.full_path();

pbs-datastore/src/snapshot_reader.rs

@@ -46,7 +46,7 @@ impl SnapshotReader {
 
         let datastore_name = datastore.name().to_string();
 
-        let manifest = match datastore.load_manifest(&snapshot) {
+        let manifest = match snapshot.load_manifest() {
             Ok((manifest, _)) => manifest,
             Err(err) => {
                 bail!(