From dcbf29e71b6b5271012f19516503a9d07c6019c5 Mon Sep 17 00:00:00 2001 From: Hannes Laimer Date: Tue, 22 Jun 2021 09:56:19 +0200 Subject: [PATCH] api: add ignore-verified and outdated-after to datastore verify endpoint preparatory change for fixing #3459 Signed-off-by: Hannes Laimer Reviewed-By: Dominik Csapak Tested-By: Dominik Csapak --- src/api2/admin/datastore.rs | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 7b7f3102..b65c12ad 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -646,6 +646,14 @@ pub fn status( schema: BACKUP_ID_SCHEMA, optional: true, }, + "ignore-verified": { + schema: IGNORE_VERIFIED_BACKUPS_SCHEMA, + optional: true, + }, + "outdated-after": { + schema: VERIFICATION_OUTDATED_AFTER_SCHEMA, + optional: true, + }, "backup-time": { schema: BACKUP_TIME_SCHEMA, optional: true, @@ -668,9 +676,12 @@ pub fn verify( backup_type: Option, backup_id: Option, backup_time: Option, + ignore_verified: Option, + outdated_after: Option, rpcenv: &mut dyn RpcEnvironment, ) -> Result { 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 worker_id; @@ -719,7 +730,9 @@ pub fn verify( &verify_worker, &backup_dir, worker.upid().clone(), - None, + Some(&move |manifest| { + verify_filter(ignore_verified, outdated_after, manifest) + }), )? { res.push(backup_dir.to_string()); } @@ -730,7 +743,9 @@ pub fn verify( &backup_group, &mut StoreProgress::new(1), worker.upid(), - None, + Some(&move |manifest| { + verify_filter(ignore_verified, outdated_after, manifest) + }), )?; failed_dirs } else { @@ -743,7 +758,14 @@ pub fn verify( 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() { worker.log("Failed to verify the following snapshots/groups:");