[pbs-devel] applied: [PATCH proxmox-backup v3 1/7] api2/tape/restore: return backup manifest in try_restore_snapshot_archive

[Dietmar Maurer]

applied

On 5/6/21 2:20 PM, Dominik Csapak wrote:
> we'll use that for partial snapshot restore
>
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>   src/api2/tape/restore.rs | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
> index f3452364..9884b379 100644
> --- a/src/api2/tape/restore.rs
> +++ b/src/api2/tape/restore.rs
> @@ -800,7 +800,7 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
>       worker: Arc<WorkerTask>,
>       decoder: &mut pxar::decoder::sync::Decoder<R>,
>       snapshot_path: &Path,
> -) -> Result<(), Error> {
> +) -> Result<BackupManifest, Error> {
>   
>       let _root = match decoder.next() {
>           None => bail!("missing root entry"),
> @@ -886,9 +886,10 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
>           }
>       }
>   
> -    if manifest.is_none() {
> -        bail!("missing manifest");
> -    }
> +    let manifest = match manifest {
> +        None => bail!("missing manifest"),
> +        Some(manifest) => manifest,
> +    };
>   
>       // Do not verify anything here, because this would be to slow (causes tape stops).
>   
> @@ -902,7 +903,7 @@ fn try_restore_snapshot_archive<R: pxar::decoder::SeqRead>(
>           bail!("Atomic rename manifest {:?} failed - {}", manifest_path, err);
>       }
>   
> -    Ok(())
> +    Ok(manifest)
>   }
>   
>   /// Try to restore media catalogs (form catalog_archives)