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 ESMTPS id 2869362249 for ; Mon, 23 Nov 2020 10:57:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2639D26F34 for ; Mon, 23 Nov 2020 10:57:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 109AE26F28 for ; Mon, 23 Nov 2020 10:57:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DC0E943EDE for ; Mon, 23 Nov 2020 10:57:23 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 23 Nov 2020 10:57:15 +0100 Message-Id: <20201123095716.2834207-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: [pbs-devel] [PATCH proxmox-backup 1/2] verification job: log failed dirs 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: Mon, 23 Nov 2020 09:57:25 -0000 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 --- 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