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

api: add ignore-verified and outdated-after to datastore verify endpoint 

preparatory change for fixing #3459

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
Reviewed-By: Dominik Csapak <d.csapak@proxmox.com>
Tested-By: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Hannes Laimer 2021-06-22 09:56:19 +02:00 committed by Thomas Lamprecht
parent 037e6c0ca8
commit dcbf29e71b
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,6 +646,14 @@ pub fn status(
schema: BACKUP_ID_SCHEMA, schema: BACKUP_ID_SCHEMA,
optional: true, optional: true,
}, },
"ignore-verified": {
schema: IGNORE_VERIFIED_BACKUPS_SCHEMA,
optional: true,
},
"outdated-after": {
schema: VERIFICATION_OUTDATED_AFTER_SCHEMA,
optional: true,
},
"backup-time": { "backup-time": {
schema: BACKUP_TIME_SCHEMA, schema: BACKUP_TIME_SCHEMA,
optional: true, optional: true,
@ -668,9 +676,12 @@ pub fn verify(
backup_type: Option<String>, backup_type: Option<String>,
backup_id: Option<String>, backup_id: Option<String>,
backup_time: Option<i64>, backup_time: Option<i64>,
ignore_verified: Option<bool>,
outdated_after: Option<i64>,
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let datastore = DataStore::lookup_datastore(&store)?; let datastore = DataStore::lookup_datastore(&store)?;
let ignore_verified = ignore_verified.unwrap_or(true);
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let worker_id; let worker_id;
@ -719,7 +730,9 @@ pub fn verify(
&verify_worker, &verify_worker,
&backup_dir, &backup_dir,
worker.upid().clone(), worker.upid().clone(),
None, Some(&move |manifest| {
verify_filter(ignore_verified, outdated_after, manifest)
}),
)? { )? {
res.push(backup_dir.to_string()); res.push(backup_dir.to_string());
} }
@ -730,7 +743,9 @@ pub fn verify(
&backup_group, &backup_group,
&mut StoreProgress::new(1), &mut StoreProgress::new(1),
worker.upid(), worker.upid(),
None, Some(&move |manifest| {
verify_filter(ignore_verified, outdated_after, manifest)
}),
)?; )?;
failed_dirs failed_dirs
} else { } else {
@ -743,7 +758,14 @@ pub fn verify(
None None
}; };
verify_all_backups(&verify_worker, worker.upid(), owner, None)? verify_all_backups(
&verify_worker,
worker.upid(),
owner,
Some(&move |manifest| {
verify_filter(ignore_verified, outdated_after, manifest)
}),
)?
}; };
if !failed_dirs.is_empty() { if !failed_dirs.is_empty() {
worker.log("Failed to verify the following snapshots/groups:"); worker.log("Failed to verify the following snapshots/groups:");