From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/4] gc: remove duplicate variable
Date: Mon, 30 Nov 2020 16:22:19 +0100 [thread overview]
Message-ID: <20201130152220.658777-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20201130152220.658777-1-f.gruenbichler@proxmox.com>
list_images already returns absolute paths, we don't need to prepend
anything.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/backup/datastore.rs | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs
index 2700d6e9..8ea0a753 100644
--- a/src/backup/datastore.rs
+++ b/src/backup/datastore.rs
@@ -491,26 +491,24 @@ impl DataStore {
}
}
- let path = self.chunk_store.relative_path(&img);
-
- match std::fs::File::open(&path) {
+ match std::fs::File::open(&img) {
Ok(file) => {
if let Ok(archive_type) = archive_type(&img) {
if archive_type == ArchiveType::FixedIndex {
let index = FixedIndexReader::new(file).map_err(|e| {
- format_err!("can't read index '{}' - {}", path.to_string_lossy(), e)
+ format_err!("can't read index '{}' - {}", img.to_string_lossy(), e)
})?;
self.index_mark_used_chunks(index, &img, status, worker)?;
} else if archive_type == ArchiveType::DynamicIndex {
let index = DynamicIndexReader::new(file).map_err(|e| {
- format_err!("can't read index '{}' - {}", path.to_string_lossy(), e)
+ format_err!("can't read index '{}' - {}", img.to_string_lossy(), e)
})?;
self.index_mark_used_chunks(index, &img, status, worker)?;
}
}
}
Err(err) if err.kind() == io::ErrorKind::NotFound => (), // ignore vanished files
- Err(err) => bail!("can't open index {} - {}", path.to_string_lossy(), err),
+ Err(err) => bail!("can't open index {} - {}", img.to_string_lossy(), err),
}
done += 1;
--
2.20.1
next prev parent reply other threads:[~2020-11-30 15:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 15:22 [pbs-devel] [PATCH proxmox-backup 0/4] GC cleanups Fabian Grünbichler
2020-11-30 15:22 ` [pbs-devel] [PATCH proxmox-backup 1/4] gc: shorten progress messages Fabian Grünbichler
2020-11-30 15:22 ` [pbs-devel] [PATCH proxmox-backup 2/4] gc: log index files found outside of expected scheme Fabian Grünbichler
2020-11-30 15:22 ` Fabian Grünbichler [this message]
2020-11-30 15:22 ` [pbs-devel] [RFC proxmox-backup 4/4] gc: don't limit index listing to same filesystem Fabian Grünbichler
2020-12-01 5:24 ` [pbs-devel] applied: [PATCH proxmox-backup 0/4] GC cleanups Dietmar Maurer
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=20201130152220.658777-4-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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