From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 9BA8C1FF38F for ; Tue, 21 May 2024 14:54:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E12E918AA8; Tue, 21 May 2024 14:54:40 +0200 (CEST) Message-ID: Date: Tue, 21 May 2024 14:54:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Backup Server development discussion , Christian Ebner References: <20240514103421.289431-1-c.ebner@proxmox.com> <20240514103421.289431-26-c.ebner@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20240514103421.289431-26-c.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 Subject: Re: [pbs-devel] [PATCH v6 proxmox-backup 25/65] client: mount: make split pxar archives mountable 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: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" clippy warning inline: On 5/14/24 12:33, Christian Ebner wrote: > Cover the cases where the pxar archive was uploaded as split payload > data and metadata streams. Instantiate the required reader and > decoder instances to access the metadata and payload data archives. > > Signed-off-by: Christian Ebner > --- > proxmox-backup-client/src/mount.rs | 34 ++++++++++++++---------------- > 1 file changed, 16 insertions(+), 18 deletions(-) > > diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs > index 67fd23468..dd9532fbe 100644 > --- a/proxmox-backup-client/src/mount.rs > +++ b/proxmox-backup-client/src/mount.rs > @@ -21,17 +21,16 @@ use pbs_api_types::BackupNamespace; > use pbs_client::tools::key_source::get_encryption_key_password; > use pbs_client::{BackupReader, RemoteChunkReader}; > use pbs_datastore::cached_chunk_reader::CachedChunkReader; > -use pbs_datastore::dynamic_index::BufferedDynamicReader; > use pbs_datastore::index::IndexFile; > use pbs_key_config::load_and_decrypt_key; > use pbs_tools::crypt_config::CryptConfig; > use pbs_tools::json::required_string_param; > > +use crate::helper; > use crate::{ > complete_group_or_snapshot, complete_img_archive_name, complete_namespace, > complete_pxar_archive_name, complete_repository, connect, dir_or_last_from_group, > - extract_repository_from_value, optional_ns_param, record_repository, BufferedDynamicReadAt, > - REPO_URL_SCHEMA, > + extract_repository_from_value, optional_ns_param, record_repository, REPO_URL_SCHEMA, > }; > > #[sortable] > @@ -219,7 +218,10 @@ async fn mount_do(param: Value, pipe: Option) -> Result { > } > }; > > - let server_archive_name = if archive_name.ends_with(".pxar") { > + let server_archive_name = if archive_name.ends_with(".pxar") > + || archive_name.ends_with(".mpxar") > + || archive_name.ends_with(".ppxar") > + { > if target.is_none() { > bail!("use the 'mount' command to mount pxar archives"); > } > @@ -246,7 +248,9 @@ async fn mount_do(param: Value, pipe: Option) -> Result { > let (manifest, _) = client.download_manifest().await?; > manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; > > - let file_info = manifest.lookup_file_info(&server_archive_name)?; > + let (archive_name, payload_archive_name) = helper::get_pxar_archive_names(&server_archive_name); > + > + let file_info = manifest.lookup_file_info(&archive_name)?; > > let daemonize = || -> Result<(), Error> { > if let Some(pipe) = pipe { > @@ -283,20 +287,14 @@ async fn mount_do(param: Value, pipe: Option) -> Result { > futures::future::select(interrupt_int.recv().boxed(), interrupt_term.recv().boxed()); > > if server_archive_name.ends_with(".didx") { > - let index = client > - .download_dynamic_index(&manifest, &server_archive_name) > - .await?; > - let most_used = index.find_most_used_chunks(8); > - let chunk_reader = RemoteChunkReader::new( > + let decoder = helper::get_pxar_fuse_accessor( > + &archive_name, > + payload_archive_name.as_ref().map(|x| x.as_str()), here you can use payload_archive_name.as_deref() instead of .as_ref().map(...) > client.clone(), > - crypt_config, > - 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)); > - let decoder = pbs_pxar_fuse::Accessor::new(reader, archive_size, None).await?; > + &manifest, > + crypt_config.clone(), > + ) > + .await?; > > let session = > pbs_pxar_fuse::Session::mount(decoder, options, false, Path::new(target.unwrap())) _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel