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 05A1E1FF39F for ; Mon, 27 May 2024 16:33:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 383C350A1; Mon, 27 May 2024 16:33:58 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 27 May 2024 16:32:35 +0200 Message-Id: <20240527143323.456002-22-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240527143323.456002-1-c.ebner@proxmox.com> References: <20240527143323.456002-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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: [pbs-devel] [PATCH v7 proxmox-backup 21/69] client: helper: add helpers for creating reader instances 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" Add module to place helper methods which need to be used in different submodules of the client. Add `get_pxar_fuse_reader`, `get_buffered_pxar_reader` and `get_pxar_fuse_accessor` to create reader instances to access pxar archives. Signed-off-by: Christian Ebner --- changes since version 6: - adapt to new PxarVariant pxar interface type - fix clippy warnings proxmox-backup-client/src/helper.rs | 72 +++++++++++++++++++++++++++++ proxmox-backup-client/src/main.rs | 2 + 2 files changed, 74 insertions(+) create mode 100644 proxmox-backup-client/src/helper.rs diff --git a/proxmox-backup-client/src/helper.rs b/proxmox-backup-client/src/helper.rs new file mode 100644 index 000000000..5b21b6720 --- /dev/null +++ b/proxmox-backup-client/src/helper.rs @@ -0,0 +1,72 @@ +use std::sync::Arc; + +use anyhow::Error; +use pbs_client::{BackupReader, RemoteChunkReader}; +use pbs_datastore::BackupManifest; +use pbs_tools::crypt_config::CryptConfig; + +use crate::{BufferedDynamicReadAt, BufferedDynamicReader, IndexFile}; + +pub(crate) async fn get_pxar_fuse_accessor( + archive_name: &str, + payload_archive_name: Option<&str>, + client: Arc, + manifest: &BackupManifest, + crypt_config: Option>, +) -> Result { + let (reader, archive_size) = + get_pxar_fuse_reader(archive_name, client.clone(), manifest, crypt_config.clone()).await?; + + let reader = if let Some(payload_archive_name) = payload_archive_name { + let (payload_reader, payload_size) = get_pxar_fuse_reader( + payload_archive_name, + client.clone(), + manifest, + crypt_config.clone(), + ) + .await?; + + pxar::PxarVariant::Split(reader, (payload_reader, payload_size)) + } else { + pxar::PxarVariant::Unified(reader) + }; + + let accessor = pbs_pxar_fuse::Accessor::new(reader, archive_size).await?; + + Ok(accessor) +} + +pub(crate) async fn get_pxar_fuse_reader( + archive_name: &str, + client: Arc, + manifest: &BackupManifest, + crypt_config: Option>, +) -> Result<(pbs_pxar_fuse::Reader, u64), Error> { + let reader = get_buffered_pxar_reader(archive_name, client, manifest, crypt_config).await?; + let archive_size = reader.archive_size(); + let reader: pbs_pxar_fuse::Reader = Arc::new(BufferedDynamicReadAt::new(reader)); + + Ok((reader, archive_size)) +} + +pub(crate) async fn get_buffered_pxar_reader( + archive_name: &str, + client: Arc, + manifest: &BackupManifest, + crypt_config: Option>, +) -> Result, Error> { + let index = client + .download_dynamic_index(manifest, archive_name) + .await?; + + let most_used = index.find_most_used_chunks(8); + let file_info = manifest.lookup_file_info(archive_name)?; + let chunk_reader = RemoteChunkReader::new( + client.clone(), + crypt_config.clone(), + file_info.chunk_crypt_mode(), + most_used, + ); + + Ok(BufferedDynamicReader::new(index, chunk_reader)) +} diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 25556d672..db0fb6324 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -72,6 +72,8 @@ mod catalog; pub use catalog::*; mod snapshot; pub use snapshot::*; +mod helper; +pub(crate) use helper::*; pub mod key; pub mod namespace; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel