From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8FF8F1FF15E for ; Tue, 28 Jan 2025 13:44:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 00B0ED213; Tue, 28 Jan 2025 13:44:32 +0100 (CET) Date: Tue, 28 Jan 2025 13:43:59 +0100 From: Gabriel Goller To: Christian Ebner Message-ID: References: <20250128114757.254609-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250128114757.254609-1-c.ebner@proxmox.com> User-Agent: NeoMutt/20241002-35-39f9a6 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [verify.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup] verify: handle manifest update errors as non-fatal 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: , Reply-To: Proxmox Backup Server development discussion Cc: pbs-devel@lists.proxmox.com Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On 28.01.2025 12:47, Christian Ebner wrote: >Since commit 8ea00f6e ("allow to abort verify jobs") errors >propagated up to the verify jobs worker call side are interpreted as >job aborts. > >The manifest update did not honor this, leading to the verify job >being aborted with the misleading log entry: >`verification failed - job aborted` > >Instead, handle the manifest update error non-fatal just like any >other verification related error, log it including the error message >and continue verification with the next item. > >Signed-off-by: Christian Ebner >--- > src/backup/verify.rs | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > >diff --git a/src/backup/verify.rs b/src/backup/verify.rs >index 840a37859..02478b165 100644 >--- a/src/backup/verify.rs >+++ b/src/backup/verify.rs >@@ -3,7 +3,7 @@ use std::sync::atomic::{AtomicUsize, Ordering}; > use std::sync::{Arc, Mutex}; > use std::time::Instant; > >-use anyhow::{bail, format_err, Error}; >+use anyhow::{bail, Error}; > use nix::dir::Dir; > use tracing::{error, info, warn}; > >@@ -399,12 +399,20 @@ pub fn verify_backup_dir_with_lock( > state: verify_result, > upid, > }; >- let verify_state = serde_json::to_value(verify_state)?; >- backup_dir >- .update_manifest(|manifest| { >+ >+ if let Err(err) = { >+ let verify_state = serde_json::to_value(verify_state)?; >+ backup_dir.update_manifest(|manifest| { > manifest.unprotected["verify_state"] = verify_state; > }) >- .map_err(|err| format_err!("unable to update manifest blob - {}", err))?; >+ } { >+ info!( >+ "verify {}:{} - manifest update error: {err}", >+ verify_worker.datastore.name(), >+ backup_dir.dir(), >+ ); Is there any reason for not using tracing::error? This would be nice to find in the syslog as well. Also using "{err:#}" would print the whole error chain/context. >+ return Ok(false); >+ } > > Ok(error_count == 0) > } _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel