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

prune api: return a usable result (we run synchronous anyways)

Browse Source
This commit is contained in:
Dietmar Maurer 2020-04-01 12:24:28 +02:00
parent 5b5ca60a07
commit dda7015497
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/api2/admin/datastore.rs
View File

@ -419,22 +419,7 @@ fn prune(
let worker_id = format!("{}_{}_{}", store, backup_type, backup_id); let worker_id = format!("{}_{}_{}", store, backup_type, backup_id);
// We use a WorkerTask just to have a task log, but run synchrounously let mut prune_result = Vec::new();
let worker = WorkerTask::new("prune", Some(worker_id), "root@pam", true)?;
let result = try_block! {
if !prune_options.keeps_something() {
worker.log("No prune selection - keeping all files.");
return Ok(());
} else {
worker.log(format!("retention options: {}", prune_options.cli_options_string()));
if dry_run {
worker.log(format!("Testing prune on store \"{}\" group \"{}/{}\"",
store, backup_type, backup_id));
} else {
worker.log(format!("Starting prune on store \"{}\" group \"{}/{}\"",
store, backup_type, backup_id));
}
}
let list = group.list_backups(&datastore.base_path())?; let list = group.list_backups(&datastore.base_path())?;
@ -442,11 +427,46 @@ fn prune(
prune_info.reverse(); // delete older snapshots first prune_info.reverse(); // delete older snapshots first
for (info, keep) in prune_info { let keep_all = !prune_options.keeps_something();
if dry_run {
for (info, mut keep) in prune_info {
if keep_all { keep = true; }
let backup_time = info.backup_dir.backup_time();
let group = info.backup_dir.group();
prune_result.push(json!({
"backup-type": group.backup_type(),
"backup-id": group.backup_id(),
"backup-time": backup_time.timestamp(),
"keep": keep,
}));
}
return Ok(json!(prune_result));
}
// We use a WorkerTask just to have a task log, but run synchrounously
let worker = WorkerTask::new("prune", Some(worker_id), "root@pam", true)?;
let result = try_block! {
if keep_all {
worker.log("No prune selection - keeping all files.");
} else {
worker.log(format!("retention options: {}", prune_options.cli_options_string()));
worker.log(format!("Starting prune on store \"{}\" group \"{}/{}\"",
store, backup_type, backup_id));
}
for (info, mut keep) in prune_info {
if keep_all { keep = true; }
let backup_time = info.backup_dir.backup_time(); let backup_time = info.backup_dir.backup_time();
let timestamp = BackupDir::backup_time_to_string(backup_time); let timestamp = BackupDir::backup_time_to_string(backup_time);
let group = info.backup_dir.group(); let group = info.backup_dir.group();
let msg = format!( let msg = format!(
"{}/{}/{} {}", "{}/{}/{} {}",
group.backup_type(), group.backup_type(),
@ -457,6 +477,13 @@ fn prune(
worker.log(msg); worker.log(msg);
prune_result.push(json!({
"backup-type": group.backup_type(),
"backup-id": group.backup_id(),
"backup-time": backup_time.timestamp(),
"keep": keep,
}));
if !(dry_run || keep) { if !(dry_run || keep) {
datastore.remove_backup_dir(&info.backup_dir)?; datastore.remove_backup_dir(&info.backup_dir)?;
} }
@ -469,9 +496,9 @@ fn prune(
if let Err(err) = result { if let Err(err) = result {
bail!("prune failed - {}", err); bail!("prune failed - {}", err);
} };
Ok(json!(worker.to_string())) // return the UPID Ok(json!(prune_result))
} }
#[api( #[api(