[pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs
Fabian Grünbichler
f.gruenbichler at proxmox.com
Mon Nov 23 10:57:15 CET 2020
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 at 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
More information about the pbs-devel
mailing list