From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 20CE0974F9 for ; Tue, 5 Mar 2024 10:28:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0E533F7C for ; Tue, 5 Mar 2024 10:27:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 5 Mar 2024 10:27:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E5716487E9 for ; Tue, 5 Mar 2024 10:27:46 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 5 Mar 2024 10:26:42 +0100 Message-Id: <20240305092703.126906-16-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240305092703.126906-1-c.ebner@proxmox.com> References: <20240305092703.126906-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 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] [RFC v2 proxmox-backup 15/36] client: restore: read payload from dedicated index 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: , X-List-Received-Date: Tue, 05 Mar 2024 09:28:25 -0000 Whenever a split pxar archive is encountered, instantiate and attach the required dedicated reader instance to the decoder instance on restore. Piping the output to stdout is not possible, this would require a decoder instance which can decode the input stream, while maintaining the pxar stream format as output. Signed-off-by: Christian Ebner --- changes since version 1: - no changes proxmox-backup-client/src/main.rs | 34 ++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index fd9a4b97..e609aa16 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -1214,7 +1214,7 @@ async fn dump_image( fn parse_archive_type(name: &str) -> (String, ArchiveType) { if name.ends_with(".didx") || name.ends_with(".fidx") || name.ends_with(".blob") { (name.into(), archive_type(name).unwrap()) - } else if name.ends_with(".pxar") { + } else if name.ends_with(".pxar") || name.ends_with(".pxar.meta") { (format!("{}.didx", name), ArchiveType::DynamicIndex) } else if name.ends_with(".img") { (format!("{}.fidx", name), ArchiveType::FixedIndex) @@ -1456,7 +1456,7 @@ async fn restore( let chunk_reader = RemoteChunkReader::new( client.clone(), - crypt_config, + crypt_config.clone(), file_info.chunk_crypt_mode(), most_used, ); @@ -1516,8 +1516,33 @@ async fn restore( } if let Some(target) = target { + let mut decoder = pxar::decoder::Decoder::from_std(reader)?; + if let Some(archive_base_name) = archive_name.strip_suffix(".pxar.meta.didx") { + let payload_archive_name = format!("{archive_base_name}.pxar.pld.didx"); + + let payload_index = client + .download_dynamic_index(&manifest, &payload_archive_name) + .await?; + + let payload_most_used = payload_index.find_most_used_chunks(8); + + let payload_chunk_reader = RemoteChunkReader::new( + client.clone(), + crypt_config, + file_info.chunk_crypt_mode(), + payload_most_used, + ); + + let payload_reader = + BufferedDynamicReader::new(payload_index, payload_chunk_reader); + + decoder = decoder.redirect_payload_input(pxar::decoder::sync::StandardReader::new( + payload_reader, + )); + } + pbs_client::pxar::extract_archive( - pxar::decoder::Decoder::from_std(reader)?, + decoder, Path::new(target), feature_flags, |path| { @@ -1527,6 +1552,9 @@ async fn restore( ) .map_err(|err| format_err!("error extracting archive - {:#}", err))?; } else { + if archive_name.ends_with(".pxar.meta.didx") { + bail!("unable to pipe pxar meta archive"); + } let mut writer = std::fs::OpenOptions::new() .write(true) .open("/dev/stdout") -- 2.39.2