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 D1FB31FF390 for ; Fri, 7 Jun 2024 11:43:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F4E21C022; Fri, 7 Jun 2024 11:43:32 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 7 Jun 2024 11:43:11 +0200 Message-Id: <20240607094313.178742-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607094313.178742-1-c.ebner@proxmox.com> References: <20240607094313.178742-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 proxmox-backup 6/8] file-restore: fallback to mpxar if catalog not present 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" The `proxmox-file-restore list` command will uses the provided path to lookup and list directory entries via the catalog. Fallback to using the metadata archive if the catalog is not present for fast lookups in a backup snapshot. This is in preparation for dropping encoding of the catalog for snapshots using split archive encoding. Proxmox VE's storage plugin uses this to allow single file restore for LXCs. Signed-off-by: Christian Ebner --- proxmox-file-restore/src/main.rs | 72 +++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index 38cc1ce85..a09873467 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -124,7 +124,8 @@ async fn list_files( ExtractPath::ListArchives => { let mut entries = vec![]; for file in manifest.files() { - if !has_pxar_filename_extension(&file.filename, true) + if !file.filename.ends_with(".pxar.didx") + && !file.filename.ends_with(".mpxar.didx") && !file.filename.ends_with(".img.fidx") { continue; @@ -146,24 +147,63 @@ async fn list_files( Ok(entries) } ExtractPath::Pxar(file, mut path) => { - let index = client - .download_dynamic_index(&manifest, CATALOG_NAME) + if let Ok(file_info) = manifest.lookup_file_info(CATALOG_NAME) { + let index = client + .download_dynamic_index(&manifest, CATALOG_NAME) + .await?; + let most_used = index.find_most_used_chunks(8); + let chunk_reader = RemoteChunkReader::new( + client.clone(), + crypt_config, + file_info.chunk_crypt_mode(), + most_used, + ); + let reader = BufferedDynamicReader::new(index, chunk_reader); + let mut catalog_reader = CatalogReader::new(reader); + + let mut fullpath = file.into_bytes(); + fullpath.append(&mut path); + + catalog_reader.list_dir_contents(&fullpath) + } else { + if path.is_empty() { + path = vec![b'/']; + } + + let (archive_name, payload_archive_name) = + pbs_client::tools::get_pxar_archive_names(&file, &manifest)?; + + let (reader, archive_size) = get_remote_pxar_reader( + &archive_name, + client.clone(), + &manifest, + crypt_config.clone(), + ) .await?; - let most_used = index.find_most_used_chunks(8); - let file_info = manifest.lookup_file_info(CATALOG_NAME)?; - let chunk_reader = RemoteChunkReader::new( - client.clone(), - crypt_config, - file_info.chunk_crypt_mode(), - most_used, - ); - let reader = BufferedDynamicReader::new(index, chunk_reader); - let mut catalog_reader = CatalogReader::new(reader); - let mut fullpath = file.into_bytes(); - fullpath.append(&mut path); + let reader = if let Some(payload_archive_name) = payload_archive_name { + let (payload_reader, payload_size) = get_remote_pxar_reader( + &payload_archive_name, + client, + &manifest, + crypt_config, + ) + .await?; + pxar::PxarVariant::Split(reader, (payload_reader, payload_size)) + } else { + pxar::PxarVariant::Unified(reader) + }; + + let accessor = Accessor::new(reader, archive_size).await?; + let path = OsStr::from_bytes(&path); - catalog_reader.list_dir_contents(&fullpath) + pbs_client::tools::pxar_metadata_catalog_lookup( + accessor, + &path, + Some(&archive_name), + ) + .await + } } ExtractPath::VM(file, path) => { let details = SnapRestoreDetails { -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel