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 945AC97661 for ; Tue, 5 Mar 2024 10:28:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 567EC403D for ; Tue, 5 Mar 2024 10:27:50 +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:48 +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 A82D6487BF for ; Tue, 5 Mar 2024 10:27:48 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 5 Mar 2024 10:26:49 +0100 Message-Id: <20240305092703.126906-23-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 22/36] catalog: shell: redirect payload reader for split streams 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:44 -0000 Allows to attach to pxar archives with split metadata and payload streams, by redirecting the payload input to a dedicated reader accessing the payload index. Signed-off-by: Christian Ebner --- changes since version 1: - fix typo in payload archive name format string - fix formatting issue proxmox-backup-client/src/catalog.rs | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs index bd7fcbbf..802518c0 100644 --- a/proxmox-backup-client/src/catalog.rs +++ b/proxmox-backup-client/src/catalog.rs @@ -207,11 +207,14 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { } }; - let server_archive_name = if archive_name.ends_with(".pxar") { - format!("{}.didx", archive_name) - } else { - bail!("Can only mount pxar archives."); - }; + let server_archive_name = + if archive_name.ends_with(".pxar") || archive_name.ends_with(".pxar.meta") { + format!("{}.didx", archive_name) + } else if archive_name.ends_with(".pxar.pld") { + bail!("Cannot mount pxar pld, use pxar meta instead"); + } else { + bail!("Can only mount pxar archives."); + }; let client = BackupReader::start( &client, @@ -240,7 +243,19 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { ) .await?; - let decoder = pbs_pxar_fuse::Accessor::new(reader, archive_size).await?; + let mut decoder = pbs_pxar_fuse::Accessor::new(reader, archive_size).await?; + + if let Some(archive_base_name) = server_archive_name.strip_suffix(".pxar.meta.didx") { + let payload_archive_name = format!("{archive_base_name}.pxar.pld.didx"); + let (payload_reader, _) = get_pxar_fuse_reader( + &payload_archive_name, + client.clone(), + &manifest, + crypt_config.clone(), + ) + .await?; + decoder = decoder.redirect_payload_input(payload_reader); + } client.download(CATALOG_NAME, &mut tmpfile).await?; let index = DynamicIndexReader::new(tmpfile) -- 2.39.2