From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 596341FF38F for ; Tue, 4 Jun 2024 10:23:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADF7CC396; Tue, 4 Jun 2024 10:24:16 +0200 (CEST) Date: Tue, 04 Jun 2024 10:24:09 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240528094303.309806-1-c.ebner@proxmox.com> <20240528094303.309806-28-c.ebner@proxmox.com> In-Reply-To: <20240528094303.309806-28-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1717489266.j7ne3vdcym.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs, proxmox.com, mount.rs] Subject: Re: [pbs-devel] [PATCH v8 proxmox-backup 27/69] 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On May 28, 2024 11:42 am, 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 > --- > changes since version 7: > - no changes > > changes since version 6: > - use newly introduced has_pxar_filename_extension helper > - adapt to PxarVariant pxar interface > - fix clippy warnings > > proxmox-backup-client/src/mount.rs | 34 +++++++++++++----------------- > proxmox-file-restore/src/main.rs | 1 + > 2 files changed, 16 insertions(+), 19 deletions(-) > > diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs > index 4d352b6e4..8b3d8915a 100644 > --- a/proxmox-backup-client/src/mount.rs > +++ b/proxmox-backup-client/src/mount.rs > @@ -10,6 +10,7 @@ use futures::future::FutureExt; > use futures::select; > use futures::stream::{StreamExt, TryStreamExt}; > use nix::unistd::{fork, ForkResult}; > +use pbs_client::tools::has_pxar_filename_extension; nit: this should be sorted below.. > use serde_json::Value; > use tokio::signal::unix::{signal, SignalKind}; > > @@ -21,17 +22,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 +219,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { > } > }; > > - let server_archive_name = if archive_name.ends_with(".pxar") { > + let server_archive_name = if has_pxar_filename_extension(archive_name, false) { > if target.is_none() { > bail!("use the 'mount' command to mount pxar archives"); > } > @@ -246,7 +246,10 @@ 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, &manifest); > + > + let file_info = manifest.lookup_file_info(&archive_name)?; > > let daemonize = || -> Result<(), Error> { > if let Some(pipe) = pipe { > @@ -283,21 +286,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_deref(), > 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(pxar::PxarVariant::Unified(reader), archive_size).await?; > + &manifest, > + crypt_config.clone(), > + ) > + .await?; > > let session = > pbs_pxar_fuse::Session::mount(decoder, options, false, Path::new(target.unwrap())) > diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs > index 680281632..61dece97d 100644 > --- a/proxmox-file-restore/src/main.rs > +++ b/proxmox-file-restore/src/main.rs > @@ -24,6 +24,7 @@ use pbs_api_types::{file_restore::FileRestoreFormat, BackupDir, BackupNamespace, > use pbs_client::pxar::{create_tar, create_zip, extract_sub_dir, extract_sub_dir_seq}; > use pbs_client::tools::{ > complete_group_or_snapshot, complete_repository, connect, extract_repository_from_value, > + has_pxar_filename_extension, > key_source::{ > crypto_parameters_keep_fd, format_key_source, get_encryption_key_password, KEYFD_SCHEMA, > KEYFILE_SCHEMA, > -- > 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