tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: prefer api-type BackupGroup for logging

Browse Source 
together with DatastoreWithNamespace where needed, to not forget
namespace information.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2022-05-16 11:00:30 +02:00
committed by Thomas Lamprecht
parent eefa297aa0
commit e13303fca6
5 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/pull.rs
View File

@ -1161,28 +1161,21 @@ pub async fn pull_ns(
let result: Result<(), Error> = proxmox_lang::try_block!({
for local_group in params.store.iter_backup_groups(target_ns.clone())? {
let local_group = local_group?;
if new_groups.contains(local_group.as_ref()) {
let local_group = local_group.group();
if new_groups.contains(local_group) {
continue;
}
let owner = params.store.get_owner(&target_ns, local_group.group())?;
let owner = params.store.get_owner(&target_ns, local_group)?;
if check_backup_owner(&owner, &params.owner).is_err() {
continue;
}
if let Some(ref group_filter) = &params.group_filter {
if !apply_filters(local_group.as_ref(), group_filter) {
if !apply_filters(local_group, group_filter) {
continue;
}
}
task_log!(
worker,
"delete vanished group '{}/{}'",
local_group.backup_type(),
local_group.backup_id()
);
match params
.store
.remove_backup_group(&target_ns, local_group.as_ref())
{
task_log!(worker, "delete vanished group '{local_group}'",);
match params.store.remove_backup_group(&target_ns, local_group) {
Ok(true) => {}
Ok(false) => {
task_log!(