* [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs
@ 2020-11-23 9:57 Fabian Grünbichler
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: [PATCH proxmox-backup 1/2] verification job: log failed dirs Thomas Lamprecht
0 siblings, 2 replies; 4+ messages in thread
From: Fabian Grünbichler @ 2020-11-23 9:57 UTC (permalink / raw)
To: pbs-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/2] verification: fix message in notification mail
2020-11-23 9:57 [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs Fabian Grünbichler
@ 2020-11-23 9:57 ` 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
1 sibling, 1 reply; 4+ messages in thread
From: Fabian Grünbichler @ 2020-11-23 9:57 UTC (permalink / raw)
To: pbs-devel
the errors Vec can contain failed groups as well (e.g., if a group has
no or an invalid owner).
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/server/email_notifications.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs
index 7a835e3f..8bfc5f55 100644
--- a/src/server/email_notifications.rs
+++ b/src/server/email_notifications.rs
@@ -81,7 +81,7 @@ const VERIFY_ERR_TEMPLATE: &str = r###"
Job ID: {{job.id}}
Datastore: {{job.store}}
-Verification failed on these snapshots:
+Verification failed on these snapshots/groups:
{{#each errors}}
{{this~}}
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 1/2] verification job: log failed dirs
2020-11-23 9:57 [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs Fabian Grünbichler
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 ` Thomas Lamprecht
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Lamprecht @ 2020-11-24 7:35 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Fabian Grünbichler
On 23.11.20 10:57, Fabian Grünbichler wrote:
> 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(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-24 7:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 9:57 [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs Fabian Grünbichler
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox