[PATCH proxmox-backup 1/3] sync: return File in load_file_into

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

since only manifests are valid blobs, indices are not. this also makes a
CRC error manifest itself as error, instead of masking as "snapshot
disappeared".

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/server/pull.rs |  5 ++++-
 src/server/sync.rs | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/server/pull.rs b/src/server/pull.rs
index 42c34732f..020dbf508 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -653,7 +653,7 @@ async fn pull_snapshot<'a>(
 
     let mut tmp_manifest_name = manifest_name.clone();
     tmp_manifest_name.set_extension("tmp");
-    let Some(tmp_manifest_blob) = reader
+    let Some(mut tmp_manifest_file) = reader
         .load_file_into(MANIFEST_BLOB_NAME.as_ref(), &tmp_manifest_name)
         .await
         .with_context(|| prefix.clone())?
@@ -661,6 +661,9 @@ async fn pull_snapshot<'a>(
         return Ok(sync_stats);
     };
 
+    let tmp_manifest_blob =
+        DataBlob::load_from_reader(&mut tmp_manifest_file).with_context(|| prefix.clone())?;
+
     let backend = &params.target.backend;
 
     let fetch_log = async |crypt_config: Option<Arc<CryptConfig>>| {
diff --git a/src/server/sync.rs b/src/server/sync.rs
index 92449ff98..d0d3ab31a 100644
--- a/src/server/sync.rs
+++ b/src/server/sync.rs
@@ -106,7 +106,7 @@ pub(crate) trait SyncSourceReader: Send + Sync {
     /// Asynchronously loads a file from the source into a local file.
     /// `filename` is the name of the file to load from the source.
     /// `into` is the path of the local file to load the source file into.
-    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error>;
+    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<File>, Error>;
 
     /// Tries to fetch the client log from the source and save it into a local file.
     async fn try_fetch_client_log(
@@ -146,7 +146,7 @@ impl SyncSourceReader for RemoteSourceReader {
         Ok(Arc::new(chunk_reader))
     }
 
-    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error> {
+    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<File>, Error> {
         let mut tmp_file = std::fs::OpenOptions::new()
             .write(true)
             .create(true)
@@ -174,7 +174,7 @@ impl SyncSourceReader for RemoteSourceReader {
             };
         };
         tmp_file.rewind()?;
-        Ok(DataBlob::load_from_reader(&mut tmp_file).ok())
+        Ok(Some(tmp_file))
     }
 
     async fn try_fetch_client_log(
@@ -245,7 +245,7 @@ impl SyncSourceReader for LocalSourceReader {
         Ok(Arc::new(chunk_reader))
     }
 
-    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error> {
+    async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<File>, Error> {
         let mut tmp_file = std::fs::OpenOptions::new()
             .write(true)
             .create(true)
@@ -256,7 +256,7 @@ impl SyncSourceReader for LocalSourceReader {
         from_path.push(filename);
         tmp_file.write_all(std::fs::read(from_path)?.as_slice())?;
         tmp_file.rewind()?;
-        Ok(DataBlob::load_from_reader(&mut tmp_file).ok())
+        Ok(Some(tmp_file))
     }
 
     async fn try_fetch_client_log(
-- 
2.47.3