[pbs-devel] [PATCH v5 proxmox-backup 27/62] api: datastore: attach optional payload chunk reader

Christian Ebner c.ebner at proxmox.com
Tue May 7 17:52:09 CEST 2024


Attach the payload chunk reader for pxar archives which have been
uploaded using split streams for metadata and payload data.

Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
changes since version 4:
- no changes

 src/api2/admin/datastore.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 67330dd4f..9e8a06671 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1814,7 +1814,15 @@ pub fn pxar_file_download(
         let (reader, archive_size) =
             get_local_pxar_reader(datastore.clone(), &manifest, &backup_dir, pxar_name)?;
 
-        let decoder = Accessor::new(reader, archive_size, None).await?;
+        let decoder = if let Some(archive_base_name) = pxar_name.strip_suffix(".mpxar.didx") {
+            let payload_archive_name = format!("{archive_base_name}.ppxar.didx");
+            let (payload_reader, payload_size) =
+                get_local_pxar_reader(datastore, &manifest, &backup_dir, &payload_archive_name)?;
+            Accessor::new(reader, archive_size, Some((payload_reader, payload_size))).await?
+        } else {
+            Accessor::new(reader, archive_size, None).await?
+        };
+
         let root = decoder.open_root().await?;
         let path = OsStr::from_bytes(file_path).to_os_string();
         let file = root
-- 
2.39.2





More information about the pbs-devel mailing list