proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-05-03 18:28:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

push: keep track of created namespaces

Browse Source 
to avoid attempting to create them multiple times in case a whole hierarchy is
missing, and misleadingly logging that they were created multiple times as
well.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2024-11-21 11:48:53 +01:00
parent e0ddb88cb7
commit c02d3a8717
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/push.rs
View File

@ -282,7 +282,7 @@ async fn remove_target_group(
// Check if the namespace is already present on the target, create it otherwise // Check if the namespace is already present on the target, create it otherwise
async fn check_or_create_target_namespace( async fn check_or_create_target_namespace(
params: &PushParameters, params: &PushParameters,
existing_target_namespaces: &[BackupNamespace], existing_target_namespaces: &mut Vec<BackupNamespace>,
target_namespace: &BackupNamespace, target_namespace: &BackupNamespace,
) -> Result<(), Error> { ) -> Result<(), Error> {
if !target_namespace.is_root() && !existing_target_namespaces.contains(target_namespace) { if !target_namespace.is_root() && !existing_target_namespaces.contains(target_namespace) {
@ -311,6 +311,7 @@ async fn check_or_create_target_namespace(
bail!("Remote creation of namespace {current} failed, remote returned: {err}") bail!("Remote creation of namespace {current} failed, remote returned: {err}")
} }
} }
existing_target_namespaces.push(current.clone());
parent = current; parent = current;
} }
} }
@ -348,7 +349,7 @@ pub(crate) async fn push_store(mut params: PushParameters) -> Result<SyncStats,
source_namespaces.sort_unstable_by_key(|a| a.name_len()); source_namespaces.sort_unstable_by_key(|a| a.name_len());
// Fetch all accessible namespaces already present on the target // Fetch all accessible namespaces already present on the target
let existing_target_namespaces = fetch_target_namespaces(&params).await?; let mut existing_target_namespaces = fetch_target_namespaces(&params).await?;
// Remember synced namespaces, removing non-synced ones when remove vanished flag is set // Remember synced namespaces, removing non-synced ones when remove vanished flag is set
let mut synced_namespaces = HashSet::with_capacity(source_namespaces.len()); let mut synced_namespaces = HashSet::with_capacity(source_namespaces.len());
@ -366,7 +367,7 @@ pub(crate) async fn push_store(mut params: PushParameters) -> Result<SyncStats,
if let Err(err) = check_or_create_target_namespace( if let Err(err) = check_or_create_target_namespace(
&params, &params,
&existing_target_namespaces, &mut existing_target_namespaces,
&target_namespace, &target_namespace,
) )
.await .await