src/api2/admin/datastore.rs: pass backup type/id (group) to prune
IMHO, prune over all backup groups is a bit dangerous, considering that more than one user might use a datastore.
This commit is contained in:
parent
7a6cfbd98d
commit
9fdc3ef46f
|
@ -214,6 +214,11 @@ fn prune(
|
|||
|
||||
let store = param["store"].as_str().unwrap();
|
||||
|
||||
let backup_type = tools::required_string_param(¶m, "backup-type")?;
|
||||
let backup_id = tools::required_string_param(¶m, "backup-id")?;
|
||||
|
||||
let group = BackupGroup::new(backup_type, backup_id);
|
||||
|
||||
let datastore = DataStore::lookup_datastore(store)?;
|
||||
|
||||
let mut keep_all = true;
|
||||
|
@ -228,17 +233,13 @@ fn prune(
|
|||
let worker = WorkerTask::new("prune", Some(store.to_owned()), "root@pam", true)?;
|
||||
let result = try_block! {
|
||||
if keep_all {
|
||||
worker.log("No selection - keeping all files.");
|
||||
worker.log("No prune selection - keeping all files.");
|
||||
return Ok(());
|
||||
} else {
|
||||
worker.log(format!("Starting prune on store {}", store));
|
||||
}
|
||||
|
||||
let backup_list = BackupInfo::list_backups(&datastore.base_path())?;
|
||||
|
||||
let group_hash = group_backups(backup_list);
|
||||
|
||||
for (_group_id, mut list) in group_hash {
|
||||
let mut list = group.list_backups(&datastore.base_path())?;
|
||||
|
||||
let mut mark = HashSet::new();
|
||||
|
||||
|
@ -283,7 +284,6 @@ fn prune(
|
|||
worker.log(format!("remove {:?}", info.backup_dir));
|
||||
datastore.remove_backup_dir(&info.backup_dir)?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
};
|
||||
|
@ -336,6 +336,8 @@ fn api_method_prune() -> ApiMethod {
|
|||
"store",
|
||||
StringSchema::new("Datastore name.")
|
||||
)
|
||||
.required("backup-type", BACKUP_TYPE_SCHEMA.clone())
|
||||
.required("backup-id", BACKUP_ID_SCHEMA.clone())
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
|
@ -840,7 +840,7 @@ fn upload_log(
|
|||
}
|
||||
|
||||
fn prune(
|
||||
mut param: Value,
|
||||
param: Value,
|
||||
_info: &ApiMethod,
|
||||
_rpcenv: &mut dyn RpcEnvironment,
|
||||
) -> Result<Value, Error> {
|
||||
|
@ -851,9 +851,14 @@ fn prune(
|
|||
|
||||
let path = format!("api2/json/admin/datastore/{}/prune", repo.store());
|
||||
|
||||
param.as_object_mut().unwrap().remove("repository");
|
||||
let group = tools::required_string_param(¶m, "group")?;
|
||||
let group = BackupGroup::parse(group)?;
|
||||
|
||||
let result = client.post(&path, Some(param)).wait()?;
|
||||
let mut args = json!({});
|
||||
args["backup-type"] = group.backup_type().into();
|
||||
args["backup-id"] = group.backup_id().into();
|
||||
|
||||
let result = client.post(&path, Some(args)).wait()?;
|
||||
|
||||
record_repository(&repo);
|
||||
|
||||
|
@ -1440,9 +1445,12 @@ We do not extraxt '.pxar' archives when writing to stdandard output.
|
|||
prune,
|
||||
proxmox_backup::api2::admin::datastore::add_common_prune_prameters(
|
||||
ObjectSchema::new("Prune backup repository.")
|
||||
.required("group", StringSchema::new("Backup group."))
|
||||
.optional("repository", REPO_URL_SCHEMA.clone())
|
||||
)
|
||||
))
|
||||
.arg_param(vec!["group"])
|
||||
.completion_cb("group", complete_backup_group)
|
||||
.completion_cb("repository", complete_repository);
|
||||
|
||||
let status_cmd_def = CliCommand::new(
|
||||
|
|
Loading…
Reference in New Issue