From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/5] garbage collect: improve index error messages
Date: Mon, 2 Nov 2020 12:34:35 +0100 [thread overview]
Message-ID: <20201102113439.26618-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com>
so that in case of a broken index file, the user knows which it is
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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 94d0cc04..36ff32c8 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
+ ));
}
}
}
--
2.20.1
next prev parent reply other threads:[~2020-11-02 11:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 11:34 [pbs-devel] [PATCH proxmox-backup 0/5] various bug fixes/improvements for gc Dominik Csapak
2020-11-02 11:34 ` Dominik Csapak [this message]
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 2/5] backup/{dynamic, fixed}_index: improve error message for small index files Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 3/5] server/gc_job: add 'to_stdout' Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 4/5] api2/admin/datastore: start the garbage_collection task with our helper Dominik Csapak
2020-11-03 5:45 ` Dietmar Maurer
2020-11-03 6:54 ` Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 5/5] proxmox-backup-proxy: use only jobstate for garbage_collection schedule Dominik Csapak
2020-11-02 20:12 ` [pbs-devel] applied: [PATCH proxmox-backup 0/5] various bug fixes/improvements for gc Thomas Lamprecht
2020-11-03 5:11 ` Dietmar Maurer
2020-11-03 7:14 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201102113439.26618-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox