proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-15 18:47:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prune job: various cleanups, line reduction

Browse Source 
no semantic change intended

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-10-07 15:39:51 +02:00
parent 97184e14b4
commit c36c901172
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/server/prune_job.rs
View File

@ -5,8 +5,8 @@ use anyhow::Error;
use proxmox_sys::{task_log, task_warn}; use proxmox_sys::{task_log, task_warn};
use pbs_api_types::{ use pbs_api_types::{
print_store_and_ns, Authid, KeepOptions, Operation, PruneJobOptions, PRIV_DATASTORE_MODIFY, print_store_and_ns, Authid, KeepOptions, Operation, PruneJobOptions, MAX_NAMESPACE_DEPTH,
PRIV_DATASTORE_PRUNE, PRIV_DATASTORE_MODIFY, PRIV_DATASTORE_PRUNE,
}; };
use pbs_datastore::prune::compute_prune_info; use pbs_datastore::prune::compute_prune_info;
use pbs_datastore::DataStore; use pbs_datastore::DataStore;
@ -23,22 +23,15 @@ pub fn prune_datastore(
dry_run: bool, dry_run: bool,
) -> Result<(), Error> { ) -> Result<(), Error> {
let store = &datastore.name(); let store = &datastore.name();
let max_depth = prune_options let max_depth = prune_options.max_depth.unwrap_or(MAX_NAMESPACE_DEPTH);
.max_depth let depth = match max_depth {
.unwrap_or(pbs_api_types::MAX_NAMESPACE_DEPTH); MAX_NAMESPACE_DEPTH => "down to full depth".to_string(),
let depth_str = if max_depth == pbs_api_types::MAX_NAMESPACE_DEPTH { max_depth if max_depth > 0 => format!("to depth {max_depth}"),
" down to full depth".to_string() _ => "non-recursive".to_string(),
} else if max_depth > 0 {
format!("to depth {max_depth}")
} else {
"non-recursive".to_string()
}; };
let ns = prune_options.ns.clone().unwrap_or_default(); let ns = prune_options.ns.clone().unwrap_or_default();
task_log!( let store_ns = print_store_and_ns(store, &ns);
worker, task_log!(worker, "Starting datastore prune on {store_ns}, {depth}");
"Starting datastore prune on {}, {depth_str}",
print_store_and_ns(store, &ns),
);
if dry_run { if dry_run {
task_log!(worker, "(dry test run)"); task_log!(worker, "(dry test run)");
@ -49,11 +42,8 @@ pub fn prune_datastore(
if keep_all { if keep_all {
task_log!(worker, "No prune selection - keeping all files."); task_log!(worker, "No prune selection - keeping all files.");
} else { } else {
task_log!( let rendered_options = cli_prune_options_string(&prune_options);
worker, task_log!(worker, "retention options: {rendered_options}");
"retention options: {}",
cli_prune_options_string(&prune_options)
);
} }
for group in ListAccessibleBackupGroups::new_with_privs( for group in ListAccessibleBackupGroups::new_with_privs(
@ -106,7 +96,7 @@ pub(crate) fn cli_prune_options_string(options: &PruneJobOptions) -> String {
if let Some(ns) = &options.ns { if let Some(ns) = &options.ns {
if !ns.is_root() { if !ns.is_root() {
opts.push(format!("--ns {}", ns)); opts.push(format!("--ns {ns}"));
} }
} }
if let Some(max_depth) = options.max_depth { if let Some(max_depth) = options.max_depth {
@ -163,7 +153,7 @@ pub fn do_prune_job(
task_log!(worker, "prune job '{}'", job.jobname()); task_log!(worker, "prune job '{}'", job.jobname());
if let Some(event_str) = schedule { if let Some(event_str) = schedule {
task_log!(worker, "task triggered by schedule '{}'", event_str); task_log!(worker, "task triggered by schedule '{event_str}'");
} }
let result = prune_datastore(worker.clone(), auth_id, prune_options, datastore, false); let result = prune_datastore(worker.clone(), auth_id, prune_options, datastore, false);
@ -171,11 +161,11 @@ pub fn do_prune_job(
let status = worker.create_state(&result); let status = worker.create_state(&result);
if let Err(err) = job.finish(status) { if let Err(err) = job.finish(status) {
eprintln!("could not finish job state for {}: {}", job.jobtype(), err); eprintln!("could not finish job state for {}: {err}", job.jobtype());
} }
if let Err(err) = crate::server::send_prune_status(&store, job.jobname(), &result) { if let Err(err) = crate::server::send_prune_status(&store, job.jobname(), &result) {
log::error!("send prune notification failed: {}", err); log::error!("send prune notification failed: {err}");
} }
result result
}, },