From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DCD6C74885 for ; Tue, 22 Jun 2021 09:56:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DA26D2381C for ; Tue, 22 Jun 2021 09:56:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C206F23801 for ; Tue, 22 Jun 2021 09:56:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9680D4377B for ; Tue, 22 Jun 2021 09:56:26 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 09:56:19 +0200 Message-Id: <20210622075620.28681-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210622075620.28681-1-h.laimer@proxmox.com> References: <20210622075620.28681-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.541 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: [pbs-devel] [PATCH v2 proxmox-backup 2/3] close #3459: api2: add ignore-verified and outdated-after to datastore verify endpoint X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 07:56:27 -0000 Signed-off-by: Hannes Laimer --- When using a schema ref it is not possible to omit the Option<_> around parameters, even if the referenced schema would contain a default value. What would be possible is to remove the schema ref and put the default directly instead, but that didn't make a lot of sense to me. 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:"); -- 2.20.1