Re: [pbs-devel] [RFC v2 proxmox-backup 21/36] catalog: shell: factor out pxar fuse reader instantiation

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On March 5, 2024 10:26 am, Christian Ebner wrote:
> In preparation to allow restoring split metadata and payload stream
> pxar archives via the catalog shell.
> 
> Make the pxar fuse reader instantiation reusable.
> 
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> changes since version 1:
> - fix formatting issue
> 
>  proxmox-backup-client/src/catalog.rs | 46 ++++++++++++++++++++--------
>  1 file changed, 33 insertions(+), 13 deletions(-)
> 
> diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs
> index 72b22e67..bd7fcbbf 100644
> --- a/proxmox-backup-client/src/catalog.rs
> +++ b/proxmox-backup-client/src/catalog.rs
> @@ -11,6 +11,7 @@ use proxmox_schema::api;
>  use pbs_api_types::BackupNamespace;
>  use pbs_client::tools::key_source::get_encryption_key_password;
>  use pbs_client::{BackupReader, RemoteChunkReader};
> +use pbs_datastore::BackupManifest;
>  use pbs_tools::crypt_config::CryptConfig;
>  use pbs_tools::json::required_string_param;
>  
> @@ -124,6 +125,32 @@ async fn dump_catalog(param: Value) -> Result<Value, Error> {
>      Ok(Value::Null)
>  }
>  
> +async fn get_pxar_fuse_reader(
> +    server_archive_name: &str,
> +    client: Arc<BackupReader>,
> +    manifest: &BackupManifest,
> +    crypt_config: Option<Arc<CryptConfig>>,
> +) -> Result<(pbs_pxar_fuse::Reader, u64), Error> {
> +    let index = client
> +        .download_dynamic_index(&manifest, &server_archive_name)
> +        .await?;
> +
> +    let most_used = index.find_most_used_chunks(8);
> +    let file_info = manifest.lookup_file_info(&server_archive_name)?;
> +    let chunk_reader = RemoteChunkReader::new(
> +        client.clone(),
> +        crypt_config.clone(),
> +        file_info.chunk_crypt_mode(),
> +        most_used,
> +    );
> +
> +    let reader = BufferedDynamicReader::new(index, chunk_reader);
> +    let archive_size = reader.archive_size();
> +    let reader: pbs_pxar_fuse::Reader = Arc::new(BufferedDynamicReadAt::new(reader));
> +
> +    Ok((reader, archive_size))
> +}

this could probably live somewhere else, and possibly be extended a bit
more to cover the full decoder creation, and then be re-used for mount
and restore as well..

> +
>  #[api(
>      input: {
>          properties: {
> @@ -205,21 +232,14 @@ async fn catalog_shell(param: Value) -> Result<(), Error> {
>      let (manifest, _) = client.download_manifest().await?;
>      manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?;
>  
> -    let index = client
> -        .download_dynamic_index(&manifest, &server_archive_name)
> -        .await?;
> -    let most_used = index.find_most_used_chunks(8);
> -
> -    let file_info = manifest.lookup_file_info(&server_archive_name)?;
> -    let chunk_reader = RemoteChunkReader::new(
> +    let (reader, archive_size) = get_pxar_fuse_reader(
> +        &server_archive_name,
>          client.clone(),
> +        &manifest,
>          crypt_config.clone(),
> -        file_info.chunk_crypt_mode(),
> -        most_used,
> -    );
> -    let reader = BufferedDynamicReader::new(index, chunk_reader);
> -    let archive_size = reader.archive_size();
> -    let reader: pbs_pxar_fuse::Reader = Arc::new(BufferedDynamicReadAt::new(reader));
> +    )
> +    .await?;
> +
>      let decoder = pbs_pxar_fuse::Accessor::new(reader, archive_size).await?;
>  
>      client.download(CATALOG_NAME, &mut tmpfile).await?;
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>