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 1E095BC440 for ; Thu, 28 Mar 2024 13:47:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 01304AE94 for ; Thu, 28 Mar 2024 13:46: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 ; Thu, 28 Mar 2024 13:46: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 7346B428EE for ; Thu, 28 Mar 2024 13:37:43 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:39 +0100 Message-Id: <20240328123707.336951-31-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [catalog.rs] Subject: [pbs-devel] [PATCH v3 proxmox-backup 30/58] 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: Thu, 28 Mar 2024 12:47:19 -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 2: - use mpxar and ppxar file extensions - use pxar fuse reader helper proxmox-backup-client/src/catalog.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs index 2073e058d..3e52880b9 100644 --- a/proxmox-backup-client/src/catalog.rs +++ b/proxmox-backup-client/src/catalog.rs @@ -181,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."); @@ -216,7 +219,18 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { ) .await?; - let decoder = pbs_pxar_fuse::Accessor::new(reader, archive_size).await?; + let decoder = if let Some(payload_archive_name) = payload_archive_name { + let (payload_reader, _) = helper::get_pxar_fuse_reader( + &payload_archive_name, + client.clone(), + &manifest, + crypt_config.clone(), + ) + .await?; + pbs_pxar_fuse::Accessor::new(reader, archive_size, Some(payload_reader)).await? + } else { + pbs_pxar_fuse::Accessor::new(reader, archive_size, None).await? + }; client.download(CATALOG_NAME, &mut tmpfile).await?; let index = DynamicIndexReader::new(tmpfile) -- 2.39.2