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

prune datastore: rework tak log

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-05-19 13:23:24 +02:00
parent 4b6a653a0f
commit 65aba79a9b
1 changed files with 13 additions and 10 deletions

23
src/server/prune_job.rs
View File

@ -22,7 +22,14 @@ pub fn prune_datastore(
dry_run: bool, dry_run: bool,
) -> Result<(), Error> { ) -> Result<(), Error> {
let store = &datastore.name(); let store = &datastore.name();
task_log!(worker, "Starting datastore prune on store \"{}\"", store); if ns.is_root() {
task_log!(worker, "Starting datastore prune on store '{store}'");
} else {
task_log!(
worker,
"Starting datastore prune on store '{store}' namespace '{ns}'"
);
}
if dry_run { if dry_run {
task_log!(worker, "(dry test run)"); task_log!(worker, "(dry test run)");
@ -59,8 +66,7 @@ pub fn prune_datastore(
task_log!( task_log!(
worker, worker,
"Starting prune on store \"{}\" group \"{}/{}\"", "Pruning group \"{}/{}\"",
store,
group.backup_type(), group.backup_type(),
group.backup_id() group.backup_id()
); );
@ -69,7 +75,8 @@ pub fn prune_datastore(
let keep = keep_all || mark.keep(); let keep = keep_all || mark.keep();
task_log!( task_log!(
worker, worker,
"{} {}/{}/{}", "{}{} {}/{}/{}",
if dry_run { "would " } else { "" },
mark, mark,
group.backup_type(), group.backup_type(),
group.backup_id(), group.backup_id(),
@ -79,12 +86,8 @@ pub fn prune_datastore(
if let Err(err) = if let Err(err) =
datastore.remove_backup_dir(ns_recursed, info.backup_dir.as_ref(), false) datastore.remove_backup_dir(ns_recursed, info.backup_dir.as_ref(), false)
{ {
task_warn!( let path = info.backup_dir.relative_path();
worker, task_warn!(worker, "failed to remove dir {path:?}: {err}");
"failed to remove dir {:?}: {}",
info.backup_dir.relative_path(),
err,
);
} }
} }
} }