From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v1 proxmox-backup 1/3] verify-job: move building of snapshot filter into function
Date: Fri, 11 Jun 2021 09:50:44 +0200 [thread overview]
Message-ID: <20210611075046.34449-2-h.laimer@proxmox.com> (raw)
In-Reply-To: <20210611075046.34449-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
src/backup/verify.rs | 29 +++++++++++++++++++++++++++++
src/server/verify_job.rs | 25 ++-----------------------
2 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index a1b1e6dd..a0b8de58 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -1,5 +1,6 @@
use nix::dir::Dir;
use std::collections::HashSet;
+use std::panic::RefUnwindSafe;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::{Arc, Mutex};
use std::time::Instant;
@@ -575,3 +576,31 @@ pub fn verify_all_backups(
Ok(errors)
}
+
+/// Builds a filter for the verification of snapshots
+pub fn build_verify_filter(
+ ignore_verified_snapshots: bool,
+ outdated_after: Option<i64>,
+) -> Box<dyn std::marker::Sync + RefUnwindSafe + Fn(&BackupManifest) -> bool> {
+ Box::new(move |manifest: &BackupManifest| {
+ if !ignore_verified_snapshots {
+ return true;
+ }
+
+ let raw_verify_state = manifest.unprotected["verify_state"].clone();
+ match serde_json::from_value::<SnapshotVerifyState>(raw_verify_state) {
+ Err(_) => true, // no last verification, always include
+ Ok(last_verify) => {
+ match outdated_after {
+ None => false, // never re-verify if ignored and no max age
+ Some(max_age) => {
+ let now = proxmox::tools::time::epoch_i64();
+ let days_since_last_verify = (now - last_verify.upid.starttime) / 86400;
+
+ days_since_last_verify > max_age
+ }
+ }
+ }
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/server/verify_job.rs b/src/server/verify_job.rs
index 1dd8baa7..47ac4da4 100644
--- a/src/server/verify_job.rs
+++ b/src/server/verify_job.rs
@@ -7,7 +7,7 @@ use crate::{
config::verify::VerificationJobConfig,
backup::{
DataStore,
- BackupManifest,
+ build_verify_filter,
verify_all_backups,
},
task_log,
@@ -26,28 +26,6 @@ pub fn do_verification_job(
let outdated_after = verification_job.outdated_after;
let ignore_verified_snapshots = verification_job.ignore_verified.unwrap_or(true);
- let filter = move |manifest: &BackupManifest| {
- if !ignore_verified_snapshots {
- return true;
- }
-
- let raw_verify_state = manifest.unprotected["verify_state"].clone();
- match serde_json::from_value::<SnapshotVerifyState>(raw_verify_state) {
- Err(_) => true, // no last verification, always include
- Ok(last_verify) => {
- match outdated_after {
- None => false, // never re-verify if ignored and no max age
- Some(max_age) => {
- let now = proxmox::tools::time::epoch_i64();
- let days_since_last_verify = (now - last_verify.upid.starttime) / 86400;
-
- days_since_last_verify > max_age
- }
- }
- }
- }
- };
-
let (email, notify) = crate::server::lookup_datastore_notify_settings(&verification_job.store);
let job_id = format!("{}:{}",
@@ -67,6 +45,7 @@ pub fn do_verification_job(
task_log!(worker,"task triggered by schedule '{}'", event_str);
}
+ let filter = build_verify_filter(ignore_verified_snapshots, outdated_after);
let verify_worker = crate::backup::VerifyWorker::new(worker.clone(), datastore);
let result = verify_all_backups(&verify_worker, worker.upid(), None, Some(&filter));
let job_result = match result {
--
2.20.1
next prev parent reply other threads:[~2021-06-11 7:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 7:50 [pbs-devel] [PATCH v1 proxmox-backup 0/3] close #3459: add --ignore-verified and --outdated-after to CLI and api2 Hannes Laimer
2021-06-11 7:50 ` Hannes Laimer [this message]
2021-06-11 13:18 ` [pbs-devel] [PATCH v1 proxmox-backup 1/3] verify-job: move building of snapshot filter into function Dominik Csapak
2021-06-11 7:50 ` [pbs-devel] [PATCH v1 proxmox-backup 2/3] api2: add ignore-verified and outdated-after to datastore verify endpoint Hannes Laimer
2021-06-11 13:20 ` Dominik Csapak
2021-06-11 7:50 ` [pbs-devel] [PATCH v1 proxmox-backup 3/3] manager_bin: add --ignore-verified and --outdated-after parameters Hannes Laimer
2021-06-11 13:21 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210611075046.34449-2-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox