From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC: 1/2] SnapshotReader: add self.datastore_name() helper
Date: Tue, 16 Mar 2021 13:10:22 +0100 [thread overview]
Message-ID: <20210316121023.11702-1-dietmar@proxmox.com> (raw)
---
src/tape/helpers/snapshot_reader.rs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/tape/helpers/snapshot_reader.rs b/src/tape/helpers/snapshot_reader.rs
index 21033d10..7b272e37 100644
--- a/src/tape/helpers/snapshot_reader.rs
+++ b/src/tape/helpers/snapshot_reader.rs
@@ -26,6 +26,7 @@ use crate::{
/// This make it easy to iterate over all used chunks and files.
pub struct SnapshotReader {
snapshot: BackupDir,
+ datastore_name: String,
file_list: Vec<String>,
locked_dir: Dir,
}
@@ -42,11 +43,13 @@ impl SnapshotReader {
"snapshot",
"locked by another operation")?;
+ let datastore_name = datastore.name().to_string();
+
let manifest = match datastore.load_manifest(&snapshot) {
Ok((manifest, _)) => manifest,
Err(err) => {
bail!("manifest load error on datastore '{}' snapshot '{}' - {}",
- datastore.name(), snapshot, err);
+ datastore_name, snapshot, err);
}
};
@@ -60,7 +63,7 @@ impl SnapshotReader {
file_list.push(CLIENT_LOG_BLOB_NAME.to_string());
}
- Ok(Self { snapshot, file_list, locked_dir })
+ Ok(Self { snapshot, datastore_name, file_list, locked_dir })
}
/// Return the snapshot directory
@@ -68,6 +71,11 @@ impl SnapshotReader {
&self.snapshot
}
+ /// Return the datastore name
+ pub fn datastore_name(&self) -> &str {
+ &self.datastore_name
+ }
+
/// Returns the list of files the snapshot refers to.
pub fn file_list(&self) -> &Vec<String> {
&self.file_list
--
2.20.1
next reply other threads:[~2021-03-16 12:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 12:10 Dietmar Maurer [this message]
2021-03-16 12:10 ` [pbs-devel] [RFC: 2/2] tape: store datastore name in snapshot archives and media catalog 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=20210316121023.11702-1-dietmar@proxmox.com \
--to=dietmar@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