From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs
Date: Mon, 23 Nov 2020 10:57:15 +0100 [thread overview]
Message-ID: <20201123095716.2834207-1-f.gruenbichler@proxmox.com> (raw)
else users have to manually search through a potentially very long task
log to find the entries that are different.. this is the same summary
printed at the end of a manual verify task.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/api2/admin/datastore.rs | 2 +-
src/server/verify_job.rs | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 872d081e..48910b14 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -695,7 +695,7 @@ pub fn verify(
verify_all_backups(datastore, worker.clone(), worker.upid(), owner, None)?
};
if failed_dirs.len() > 0 {
- worker.log("Failed to verify following snapshots/groups:");
+ worker.log("Failed to verify the following snapshots/groups:");
for dir in failed_dirs {
worker.log(format!("\t{}", dir));
}
diff --git a/src/server/verify_job.rs b/src/server/verify_job.rs
index bcf57f8a..bffbf8ab 100644
--- a/src/server/verify_job.rs
+++ b/src/server/verify_job.rs
@@ -69,8 +69,15 @@ pub fn do_verification_job(
let result = verify_all_backups(datastore, worker.clone(), worker.upid(), None, Some(&filter));
let job_result = match result {
- Ok(ref errors) if errors.is_empty() => Ok(()),
- Ok(_) => Err(format_err!("verification failed - please check the log for details")),
+ Ok(ref failed_dirs) if failed_dirs.is_empty() => Ok(()),
+ Ok(ref failed_dirs) => {
+ worker.log("Failed to verify the following snapshots/groups:");
+ for dir in failed_dirs {
+ worker.log(format!("\t{}", dir));
+ }
+
+ Err(format_err!("verification failed - please check the log for details"))
+ },
Err(_) => Err(format_err!("verification failed - job aborted")),
};
--
2.20.1
next reply other threads:[~2020-11-23 9:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 9:57 Fabian Grünbichler [this message]
2020-11-23 9:57 ` [pbs-devel] [PATCH proxmox-backup 2/2] verification: fix message in notification mail Fabian Grünbichler
2020-11-24 7:35 ` [pbs-devel] applied: " Thomas Lamprecht
2020-11-24 7:35 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] verification job: log failed dirs Thomas Lamprecht
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=20201123095716.2834207-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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