From 2f0b92352d3e1807c1f6e91d78f68887a8f52459 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 2 Nov 2020 12:34:35 +0100 Subject: [PATCH] garbage collect: improve index error messages so that in case of a broken index file, the user knows which it is Signed-off-by: Dominik Csapak --- src/backup/datastore.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 94d0cc04f..36ff32c87 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -475,10 +475,22 @@ impl DataStore { Ok(file) => { if let Ok(archive_type) = archive_type(&path) { if archive_type == ArchiveType::FixedIndex { - let index = FixedIndexReader::new(file)?; + let index = FixedIndexReader::new(file).map_err(|err| { + format_err!( + "cannot read fixed index {}: {}", + full_path.to_string_lossy(), + err + ) + })?; self.index_mark_used_chunks(index, &path, status, worker)?; } else if archive_type == ArchiveType::DynamicIndex { - let index = DynamicIndexReader::new(file)?; + let index = DynamicIndexReader::new(file).map_err(|err| { + format_err!( + "cannot read dynamic index {}: {}", + full_path.to_string_lossy(), + err + ) + })?; self.index_mark_used_chunks(index, &path, status, worker)?; } } @@ -487,7 +499,11 @@ impl DataStore { if err.kind() == std::io::ErrorKind::NotFound { // simply ignore vanished files } else { - return Err(err.into()); + return Err(format_err!( + "cannot open index {}: {}", + full_path.to_string_lossy(), + err + )); } } }