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 UTF8SMTPS id E869471AF6 for ; Fri, 11 Jun 2021 15:20:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with UTF8SMTP id E5F3412EFF for ; Fri, 11 Jun 2021 15:20:30 +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 UTF8SMTPS id 6414512EF1 for ; Fri, 11 Jun 2021 15:20:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with UTF8SMTP id 3B17642B8B; Fri, 11 Jun 2021 15:20:30 +0200 (CEST) Message-ID: <1209e33c-a334-28a3-db38-408ddb018e3d@proxmox.com> Date: Fri, 11 Jun 2021 15:20:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:90.0) Gecko/20100101 Thunderbird/90.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Hannes Laimer References: <20210611075046.34449-1-h.laimer@proxmox.com> <20210611075046.34449-3-h.laimer@proxmox.com> From: Dominik Csapak In-Reply-To: <20210611075046.34449-3-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.933 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [pbs-devel] [PATCH v1 proxmox-backup 2/3] 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: Fri, 11 Jun 2021 13:20:31 -0000 comment(s) inline On 6/11/21 09:50, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/api2/admin/datastore.rs | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index e0dfeecc..13830298 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, if we add a 'default: true' here, we can | v > + }, > + "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, omit the Option here and simply make that a bool then | v > + outdated_after: Option, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > let datastore = DataStore::lookup_datastore(&store)?; > + let ignore_verified = ignore_verified.unwrap_or(true); this line can be removed > > let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; > let worker_id; > @@ -712,6 +723,7 @@ pub fn verify( > auth_id.clone(), > to_stdout, > move |worker| { > + let filter = build_verify_filter(ignore_verified, outdated_after); > let verify_worker = crate::backup::VerifyWorker::new(worker.clone(), datastore); > let failed_dirs = if let Some(backup_dir) = backup_dir { > let mut res = Vec::new(); > @@ -719,7 +731,7 @@ pub fn verify( > &verify_worker, > &backup_dir, > worker.upid().clone(), > - None, > + Some(&filter), > )? { > res.push(backup_dir.to_string()); > } > @@ -730,7 +742,7 @@ pub fn verify( > &backup_group, > &mut StoreProgress::new(1), > worker.upid(), > - None, > + Some(&filter), > )?; > failed_dirs > } else { > @@ -743,7 +755,7 @@ pub fn verify( > None > }; > > - verify_all_backups(&verify_worker, worker.upid(), owner, None)? > + verify_all_backups(&verify_worker, worker.upid(), owner, Some(&filter))? > }; > if !failed_dirs.is_empty() { > worker.log("Failed to verify the following snapshots/groups:"); >