[pbs-devel] [PATCH proxmox-backup 1/2] backup/datastore: really lock manifest on delete

Dominik Csapak d.csapak at proxmox.com
Wed Dec 2 14:19:56 CET 2020


'lock_manifest' returns a Result<File, Error> so we always got the result,
even when we did not get the lock, but we acted like we had.

bubble the locking error up

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 src/backup/datastore.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs
index e6be1f67..0f74ac3c 100644
--- a/src/backup/datastore.rs
+++ b/src/backup/datastore.rs
@@ -244,7 +244,7 @@ impl DataStore {
         let (_guard, _manifest_guard);
         if !force {
             _guard = lock_dir_noblock(&full_path, "snapshot", "possibly running or in use")?;
-            _manifest_guard = self.lock_manifest(backup_dir);
+            _manifest_guard = self.lock_manifest(backup_dir)?;
         }
 
         log::info!("removing backup snapshot {:?}", full_path);
-- 
2.20.1





More information about the pbs-devel mailing list