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 BE10095EBB for ; Wed, 28 Feb 2024 15:03:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10F5CD03F for ; Wed, 28 Feb 2024 15:02:56 +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 ; Wed, 28 Feb 2024 15:02:51 +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 33C0A47BC3 for ; Wed, 28 Feb 2024 15:02:50 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 28 Feb 2024 15:02:09 +0100 Message-Id: <20240228140226.1251979-20-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228140226.1251979-1-c.ebner@proxmox.com> References: <20240228140226.1251979-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 proxmox-backup 19/36] api: datastore: refactor getting local chunk reader 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: Wed, 28 Feb 2024 14:03:52 -0000 Move the code to get the local chunk reader to a dedicated function to make it reusable. The same code is required to get the local chunk reader for the payload stream for split stream archives. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index a95031e7..843b9ce5 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1653,6 +1653,29 @@ pub const API_METHOD_PXAR_FILE_DOWNLOAD: ApiMethod = ApiMethod::new( &Permission::Anybody, ); +fn get_local_pxar_reader( + datastore: Arc, + manifest: &BackupManifest, + backup_dir: &BackupDir, + pxar_name: &str, +) -> Result<(LocalDynamicReadAt, u64), Error> { + let mut path = datastore.base_path(); + path.push(backup_dir.relative_path()); + path.push(pxar_name); + + let index = DynamicIndexReader::open(&path) + .map_err(|err| format_err!("unable to read dynamic index '{:?}' - {}", &path, err))?; + + let (csum, size) = index.compute_csum(); + manifest.verify_file(pxar_name, &csum, size)?; + + let chunk_reader = LocalChunkReader::new(datastore, None, CryptMode::None); + let reader = BufferedDynamicReader::new(index, chunk_reader); + let archive_size = reader.archive_size(); + + Ok((LocalDynamicReadAt::new(reader), archive_size)) +} + pub fn pxar_file_download( _parts: Parts, _req_body: Body, @@ -1697,20 +1720,10 @@ pub fn pxar_file_download( } } - let mut path = datastore.base_path(); - path.push(backup_dir.relative_path()); - path.push(pxar_name); + let (reader, archive_size) = + get_local_pxar_reader(datastore.clone(), &manifest, &backup_dir, &pxar_name)?; - let index = DynamicIndexReader::open(&path) - .map_err(|err| format_err!("unable to read dynamic index '{:?}' - {}", &path, err))?; - let (csum, size) = index.compute_csum(); - manifest.verify_file(pxar_name, &csum, size)?; - - let chunk_reader = LocalChunkReader::new(datastore, None, CryptMode::None); - let reader = BufferedDynamicReader::new(index, chunk_reader); - let archive_size = reader.archive_size(); - let reader = LocalDynamicReadAt::new(reader); let decoder = Accessor::new(reader, archive_size).await?; let root = decoder.open_root().await?; -- 2.39.2