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 5C83AB8CC8 for ; Mon, 11 Mar 2024 15:59:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F0A8B738 for ; Mon, 11 Mar 2024 15:58:42 +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:41 +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 666A6488EB for ; Mon, 11 Mar 2024 15:58:41 +0100 (CET) Date: Mon, 11 Mar 2024 15:58:35 +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-22-c.ebner@proxmox.com> In-Reply-To: <20240305092703.126906-22-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1710167153.rzmzsvvojl.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 21/36] catalog: shell: factor out pxar fuse reader instantiation 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:59:12 -0000 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. >=20 > Make the pxar fuse reader instantiation reusable. >=20 > Signed-off-by: Christian Ebner > --- > changes since version 1: > - fix formatting issue >=20 > proxmox-backup-client/src/catalog.rs | 46 ++++++++++++++++++++-------- > 1 file changed, 33 insertions(+), 13 deletions(-) >=20 > 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; > =20 > @@ -124,6 +125,32 @@ async fn dump_catalog(param: Value) -> Result { > Ok(Value::Null) > } > =20 > +async fn get_pxar_fuse_reader( > + server_archive_name: &str, > + client: Arc, > + manifest: &BackupManifest, > + crypt_config: Option>, > +) -> Result<(pbs_pxar_fuse::Reader, u64), Error> { > + let index =3D client > + .download_dynamic_index(&manifest, &server_archive_name) > + .await?; > + > + let most_used =3D index.find_most_used_chunks(8); > + let file_info =3D manifest.lookup_file_info(&server_archive_name)?; > + let chunk_reader =3D RemoteChunkReader::new( > + client.clone(), > + crypt_config.clone(), > + file_info.chunk_crypt_mode(), > + most_used, > + ); > + > + let reader =3D BufferedDynamicReader::new(index, chunk_reader); > + let archive_size =3D reader.archive_size(); > + let reader: pbs_pxar_fuse::Reader =3D 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, _) =3D client.download_manifest().await?; > manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; > =20 > - let index =3D client > - .download_dynamic_index(&manifest, &server_archive_name) > - .await?; > - let most_used =3D index.find_most_used_chunks(8); > - > - let file_info =3D manifest.lookup_file_info(&server_archive_name)?; > - let chunk_reader =3D RemoteChunkReader::new( > + let (reader, archive_size) =3D get_pxar_fuse_reader( > + &server_archive_name, > client.clone(), > + &manifest, > crypt_config.clone(), > - file_info.chunk_crypt_mode(), > - most_used, > - ); > - let reader =3D BufferedDynamicReader::new(index, chunk_reader); > - let archive_size =3D reader.archive_size(); > - let reader: pbs_pxar_fuse::Reader =3D Arc::new(BufferedDynamicReadAt= ::new(reader)); > + ) > + .await?; > + > let decoder =3D pbs_pxar_fuse::Accessor::new(reader, archive_size).a= wait?; > =20 > client.download(CATALOG_NAME, &mut tmpfile).await?; > --=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