From 0e2bf3aa1d90f13a8f8685f5d867aaea24a42c66 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 16 Mar 2021 10:43:20 +0100 Subject: [PATCH] SnapshotReader: add self.datastore_name() helper --- 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, 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 { &self.file_list