[pbs-devel] [PATCH proxmox-backup 1/2] blob/chunk parse errors: add context
Fabian Grünbichler
f.gruenbichler at proxmox.com
Thu Jul 20 12:23:55 CEST 2023
to make it more obvious that blob is a chunk here and which one is affected.
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
Notes:
encountered here: https://forum.proxmox.com/threads/restore-failed-unable-to-parse-raw-blob-wrong-magic.130828
the remote chunk reader change is only visible in VM restore logs if the Qemu
lib is rebuilt as well, since pbs-restore needs to pick up the change..
pbs-client/src/remote_chunk_reader.rs | 5 +++--
src/bin/proxmox_backup_debug/recover.rs | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pbs-client/src/remote_chunk_reader.rs b/pbs-client/src/remote_chunk_reader.rs
index c975c006..86f7549f 100644
--- a/pbs-client/src/remote_chunk_reader.rs
+++ b/pbs-client/src/remote_chunk_reader.rs
@@ -3,7 +3,7 @@ use std::future::Future;
use std::pin::Pin;
use std::sync::{Arc, Mutex};
-use anyhow::{bail, Error};
+use anyhow::{bail, format_err, Error};
use proxmox_async::runtime::block_on;
@@ -51,7 +51,8 @@ impl RemoteChunkReader {
self.client.download_chunk(digest, &mut chunk_data).await?;
- let chunk = DataBlob::load_from_reader(&mut &chunk_data[..])?;
+ let chunk = DataBlob::load_from_reader(&mut &chunk_data[..])
+ .map_err(|err| format_err!("Failed to parse chunk {} - {err}", hex::encode(digest)))?;
match self.crypt_mode {
CryptMode::Encrypt => match chunk.crypt_mode()? {
diff --git a/src/bin/proxmox_backup_debug/recover.rs b/src/bin/proxmox_backup_debug/recover.rs
index 113da6da..ccac476b 100644
--- a/src/bin/proxmox_backup_debug/recover.rs
+++ b/src/bin/proxmox_backup_debug/recover.rs
@@ -142,7 +142,7 @@ fn recover_index(
if ignore_corrupt_chunks {
create_zero_chunk(format!("is corrupt - {err}"))
} else {
- bail!("{err}");
+ bail!("Failed to parse chunk {chunk_path:?} - {err}");
}
})?
}
--
2.39.2
More information about the pbs-devel
mailing list