[pbs-devel] [PATCH proxmox-backup] close #5571: client: fix regression for `map` command

[pbs-devel] [PATCH proxmox-backup] close #5571: client: fix regression for `map` command

[Christian Ebner]

Fixes a regression introduced by commit 08fe5052:
"client: mount: make split pxar archives mountable"

This commit introduced functionality to mount split pxar archives
(sharing code with the map command), moving the manifest lookup
exclusive to fixed index archives.
However, the lookup now uses the incorrect archive name, not
containing the `.fidx` extension, which is however required for the
lookup in the manifest.

Fix the issue by calling the method with the correct server archive
name including the required extension.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 proxmox-backup-client/src/mount.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs
index d96690839..538a40e68 100644
--- a/proxmox-backup-client/src/mount.rs
+++ b/proxmox-backup-client/src/mount.rs
@@ -302,7 +302,7 @@ async fn mount_do(param: Value, pipe: Option<OwnedFd>) -> Result<Value, Error> {
             }
         }
     } else if server_archive_name.ends_with(".fidx") {
-        let file_info = manifest.lookup_file_info(archive_name)?;
+        let file_info = manifest.lookup_file_info(&server_archive_name)?;
         let index = client
             .download_fixed_index(&manifest, &server_archive_name)
             .await?;
-- 
2.39.2



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] close #5571: client: fix regression for `map` command

[Gabriel Goller]

On 02.07.2024 09:24, Christian Ebner wrote:
>Fixes a regression introduced by commit 08fe5052:
>"client: mount: make split pxar archives mountable"
>
>This commit introduced functionality to mount split pxar archives
>(sharing code with the map command), moving the manifest lookup
>exclusive to fixed index archives.
>However, the lookup now uses the incorrect archive name, not
>containing the `.fidx` extension, which is however required for the
>lookup in the manifest.
>
>Fix the issue by calling the method with the correct server archive
>name including the required extension.
>
>Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
>---
> proxmox-backup-client/src/mount.rs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs
>index d96690839..538a40e68 100644
>--- a/proxmox-backup-client/src/mount.rs
>+++ b/proxmox-backup-client/src/mount.rs
>@@ -302,7 +302,7 @@ async fn mount_do(param: Value, pipe: Option<OwnedFd>) -> Result<Value, Error> {
>             }
>         }
>     } else if server_archive_name.ends_with(".fidx") {
>-        let file_info = manifest.lookup_file_info(archive_name)?;
>+        let file_info = manifest.lookup_file_info(&server_archive_name)?;
>         let index = client
>             .download_fixed_index(&manifest, &server_archive_name)
>             .await?;

Works great!

Consider:
Tested-by: Gabriel Goller <g.goller@proxmox.com>
Reviewed-by: Gabriel Goller <g.goller@proxmox.com>


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] close #5571: client: fix regression for `map` command

[Christian Ebner]

> On 02.07.2024 09:50 CEST Gabriel Goller <g.goller@proxmox.com> wrote:
> 
> Works great!
> 
> Consider:
> Tested-by: Gabriel Goller <g.goller@proxmox.com>
> Reviewed-by: Gabriel Goller <g.goller@proxmox.com>

Thanks for double checking Gabriel!

To add, I think it would make sense to create a dedicated wrapper type for archive names, so that such issues are catched by the Rust type system at compile time. Will have a closer look at that.


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

[pbs-devel] applied: [PATCH proxmox-backup] close #5571: client: fix regression for `map` command

[Fabian Grünbichler]

with Gabriel's T-b/R-b, and the commit reference reformatted into a
proper "Fixes:" trailer.

On July 2, 2024 9:24 am, Christian Ebner wrote:
> Fixes a regression introduced by commit 08fe5052:
> "client: mount: make split pxar archives mountable"
> 
> This commit introduced functionality to mount split pxar archives
> (sharing code with the map command), moving the manifest lookup
> exclusive to fixed index archives.
> However, the lookup now uses the incorrect archive name, not
> containing the `.fidx` extension, which is however required for the
> lookup in the manifest.
> 
> Fix the issue by calling the method with the correct server archive
> name including the required extension.
> 
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
>  proxmox-backup-client/src/mount.rs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs
> index d96690839..538a40e68 100644
> --- a/proxmox-backup-client/src/mount.rs
> +++ b/proxmox-backup-client/src/mount.rs
> @@ -302,7 +302,7 @@ async fn mount_do(param: Value, pipe: Option<OwnedFd>) -> Result<Value, Error> {
>              }
>          }
>      } else if server_archive_name.ends_with(".fidx") {
> -        let file_info = manifest.lookup_file_info(archive_name)?;
> +        let file_info = manifest.lookup_file_info(&server_archive_name)?;
>          let index = client
>              .download_fixed_index(&manifest, &server_archive_name)
>              .await?;
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
> 


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel