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

Wolfgang Bumiller w.bumiller at proxmox.com
Wed Dec 2 14:40:05 CET 2020


applied this one

On Wed, Dec 02, 2020 at 02:19:56PM +0100, Dominik Csapak wrote:
> '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