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 0F7E11FF38E for ; Tue, 14 May 2024 12:35:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50F7B3F7B; Tue, 14 May 2024 12:34:59 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 14 May 2024 12:33:44 +0200 Message-Id: <20240514103421.289431-29-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240514103421.289431-1-c.ebner@proxmox.com> References: <20240514103421.289431-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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: [pbs-devel] [PATCH v6 proxmox-backup 28/65] catalog: shell: make split pxar archives accessible 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" 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, using the corresponding helper methods. Allows to restore split metadata and payload stream pxar archives via the catalog shell. Signed-off-by: Christian Ebner --- proxmox-backup-client/src/catalog.rs | 30 +++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs index db919477f..0f56e1224 100644 --- a/proxmox-backup-client/src/catalog.rs +++ b/proxmox-backup-client/src/catalog.rs @@ -14,12 +14,13 @@ use pbs_client::{BackupReader, RemoteChunkReader}; use pbs_tools::crypt_config::CryptConfig; use pbs_tools::json::required_string_param; +use crate::helper; use crate::{ complete_backup_snapshot, complete_group_or_snapshot, complete_namespace, complete_pxar_archive_name, complete_repository, connect, crypto_parameters, decrypt_key, dir_or_last_from_group, extract_repository_from_value, format_key_source, optional_ns_param, - record_repository, BackupDir, BufferedDynamicReadAt, BufferedDynamicReader, CatalogReader, - DynamicIndexReader, IndexFile, Shell, CATALOG_NAME, KEYFD_SCHEMA, REPO_URL_SCHEMA, + record_repository, BackupDir, BufferedDynamicReader, CatalogReader, DynamicIndexReader, + IndexFile, Shell, CATALOG_NAME, KEYFD_SCHEMA, REPO_URL_SCHEMA, }; #[api( @@ -180,7 +181,10 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { } }; - 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") + { format!("{}.didx", archive_name) } else { bail!("Can only mount pxar archives."); @@ -205,22 +209,16 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { let (manifest, _) = client.download_manifest().await?; manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; - let index = client - .download_dynamic_index(&manifest, &server_archive_name) - .await?; - let most_used = index.find_most_used_chunks(8); + let (archive_name, payload_archive_name) = helper::get_pxar_archive_names(&server_archive_name); - let file_info = manifest.lookup_file_info(&server_archive_name)?; - let chunk_reader = RemoteChunkReader::new( + let decoder = helper::get_pxar_fuse_accessor( + &archive_name, + payload_archive_name.as_ref().map(|x| x.as_str()), client.clone(), + &manifest, crypt_config.clone(), - 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?; + ) + .await?; client.download(CATALOG_NAME, &mut tmpfile).await?; let index = DynamicIndexReader::new(tmpfile) -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel