backup/datastore: really lock manifest on delete

'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@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-12-02 14:19:56 +01:00 committed by Wolfgang Bumiller
parent f6e28f4e62
commit 6bd0a00c46

View File

@ -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);