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 83F3B1FF39B for ; Mon, 17 Jun 2024 10:13:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75EB0378FD; Mon, 17 Jun 2024 10:13:39 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 17 Jun 2024 10:12:53 +0200 Message-ID: <20240617081259.73805-4-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617081259.73805-1-g.goller@proxmox.com> References: <20240617081259.73805-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.057 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 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 - Subject: [pbs-devel] [PATCH proxmox-backup v3 3/4] pxar: add UniqueContext helper 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" To create a pxar archive, we recursively traverse the target folder. If there is an error further down and we add a context using anyhow, the context will be duplicated and we get an output like: > Error: error at "xattr/xattr.txt": error at "xattr/xattr.txt": E2BIG [skip] This is obviously not optimal, so in recursive contexts we can use the UniqueContext, which quickly checks the context from the last item in the error chain and only adds it if it is unique. Signed-off-by: Gabriel Goller --- pbs-client/src/pxar/create.rs | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index c9a8c744..89a5b5ab 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -1,5 +1,6 @@ use std::collections::{HashMap, HashSet}; use std::ffi::{CStr, CString, OsStr}; +use std::fmt::Display; use std::io::{self, Read}; use std::mem::size_of; use std::ops::Range; @@ -116,12 +117,32 @@ pub fn is_virtual_file_system(magic: i64) -> bool { SYSFS_MAGIC) } +trait UniqueContext { + fn unique_context(self, context: S) -> Result + where + S: Display + Send + Sync + 'static; } +impl UniqueContext for Result { + fn unique_context(self, context: S) -> Result + where + S: Display + Send + Sync + 'static, + { + match self { + Ok(ok) => Ok(ok), + Err(err) => { + let last_error = err.chain().next(); + if let Some(e) = last_error { + if e.to_string() == context.to_string() { + return Err(err); + } + } + Err(err.context(context)) + } + } } } - #[derive(Eq, PartialEq, Hash)] pub(crate) struct HardLinkInfo { st_dev: u64, @@ -386,7 +407,7 @@ impl Archiver { &file_entry.stat, ) .await - .context(format!("error at {:?}", self.path))?; + .unique_context(format!("error at {:?}", self.path))?; } self.path = old_path; self.entry_counter = entry_counter; -- 2.43.0 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel