From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5B90BB8C79 for ; Mon, 11 Mar 2024 15:58:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 42A99B763 for ; Mon, 11 Mar 2024 15:58:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 11 Mar 2024 15:58:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 704FF403EC for ; Mon, 11 Mar 2024 15:58:53 +0100 (CET) Date: Mon, 11 Mar 2024 15:58:47 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240305092703.126906-1-c.ebner@proxmox.com> <20240305092703.126906-23-c.ebner@proxmox.com> In-Reply-To: <20240305092703.126906-23-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1710167200.op56iliglh.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [RFC v2 proxmox-backup 22/36] catalog: shell: redirect payload reader for split streams X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2024 14:58:54 -0000 On March 5, 2024 10:26 am, Christian Ebner wrote: > Allows to attach to pxar archives with split metadata and payload > streams, by redirecting the payload input to a dedicated reader > accessing the payload index. >=20 > Signed-off-by: Christian Ebner > --- > changes since version 1: > - fix typo in payload archive name format string > - fix formatting issue >=20 > proxmox-backup-client/src/catalog.rs | 27 +++++++++++++++++++++------ > 1 file changed, 21 insertions(+), 6 deletions(-) >=20 > diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client= /src/catalog.rs > index bd7fcbbf..802518c0 100644 > --- a/proxmox-backup-client/src/catalog.rs > +++ b/proxmox-backup-client/src/catalog.rs > @@ -207,11 +207,14 @@ async fn catalog_shell(param: Value) -> Result<(), = Error> { > } > }; > =20 > - let server_archive_name =3D if archive_name.ends_with(".pxar") { > - format!("{}.didx", archive_name) > - } else { > - bail!("Can only mount pxar archives."); > - }; > + let server_archive_name =3D > + if archive_name.ends_with(".pxar") || archive_name.ends_with(".p= xar.meta") { > + format!("{}.didx", archive_name) > + } else if archive_name.ends_with(".pxar.pld") { > + bail!("Cannot mount pxar pld, use pxar meta instead"); same here, I think this could just be mapped to the pxar.meta variant.. > + } else { > + bail!("Can only mount pxar archives."); > + }; > =20 > let client =3D BackupReader::start( > &client, > @@ -240,7 +243,19 @@ async fn catalog_shell(param: Value) -> Result<(), E= rror> { > ) > .await?; > =20 > - let decoder =3D pbs_pxar_fuse::Accessor::new(reader, archive_size).a= wait?; > + let mut decoder =3D pbs_pxar_fuse::Accessor::new(reader, archive_siz= e).await?; > + > + if let Some(archive_base_name) =3D server_archive_name.strip_suffix(= ".pxar.meta.didx") { > + let payload_archive_name =3D format!("{archive_base_name}.pxar.p= ld.didx"); > + let (payload_reader, _) =3D get_pxar_fuse_reader( > + &payload_archive_name, > + client.clone(), > + &manifest, > + crypt_config.clone(), > + ) > + .await?; > + decoder =3D decoder.redirect_payload_input(payload_reader); > + } > =20 > client.download(CATALOG_NAME, &mut tmpfile).await?; > let index =3D DynamicIndexReader::new(tmpfile) > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20