tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync: fix source store+namespace printing

Browse Source 
previously this would always refer to the "top" namespace of the source,
instead of properly iterating over the namespace tree. adapt the trait
accordingly, since this was the only call site.

this fixes a cosmetic issue only.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-11-30 11:50:39 +01:00 committed by Thomas Lamprecht
parent b14e5dcb59
commit 4cc4ea64fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/pull.rs
View File

@ -91,7 +91,7 @@ trait PullSource: Send + Sync {
worker: &WorkerTask,
) -> Result<Vec<BackupDir>, Error>;
fn get_ns(&self) -> BackupNamespace;
fn print_store_and_ns(&self) -> String;
fn get_store(&self) -> &str;
/// Returns a reader for reading data from a specific backup directory.
async fn reader(
@ -229,8 +229,8 @@ impl PullSource for RemoteSource {
self.ns.clone()
}
fn print_store_and_ns(&self) -> String {
print_store_and_ns(self.repo.store(), &self.ns)
fn get_store(&self) -> &str {
&self.repo.store()
}
async fn reader(
@ -299,8 +299,8 @@ impl PullSource for LocalSource {
self.ns.clone()
}
fn print_store_and_ns(&self) -> String {
print_store_and_ns(self.store.name(), &self.ns)
fn get_store(&self) -> &str {
self.store.name()
}
async fn reader(
@ -1269,7 +1269,7 @@ pub(crate) async fn pull_store(
let mut synced_ns = HashSet::with_capacity(namespaces.len());
for namespace in namespaces {
let source_store_ns_str = params.source.print_store_and_ns();
let source_store_ns_str = print_store_and_ns(params.source.get_store(), &namespace);
let target_ns = namespace.map_prefix(&params.source.get_ns(), &params.target.ns)?;
let target_store_ns_str = print_store_and_ns(params.target.store.name(), &target_ns);