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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 772B49233A for ; Fri, 16 Feb 2024 18:45:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F537692F for ; Fri, 16 Feb 2024 18:44:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Fri, 16 Feb 2024 18:44:45 +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 3254648577 for ; Fri, 16 Feb 2024 18:44:45 +0100 (CET) Message-ID: <1b3d2c4e-a520-4421-98f7-c5c99543cfc5@proxmox.com> Date: Fri, 16 Feb 2024 18:44:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pbs-devel@lists.proxmox.com References: <20240216153317.323260-1-g.goller@proxmox.com> <20240216153317.323260-4-g.goller@proxmox.com> From: Max Carrara In-Reply-To: <20240216153317.323260-4-g.goller@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup 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: , X-List-Received-Date: Fri, 16 Feb 2024 17:45:19 -0000 On 2/16/24 16:33, Gabriel Goller wrote: > 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, 24 insertions(+), 1 deletion(-) > > diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs > index 06f396e0..7bec35c4 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::os::unix::ffi::OsStrExt; > use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd}; > @@ -88,8 +89,30 @@ 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)) > + }, > + } > } > } The trait plus the impl could perhaps be inlined inside the body of `Archiver::archive_dir_contents`, as `unique_context()` is only used in there, but I think it's also fine if it says where it is. Looks good otherwise! > > @@ -242,7 +265,7 @@ impl Archiver { > (self.callback)(&file_entry.path)?; > self.path = file_entry.path; > self.add_entry(encoder, dir_fd, &file_entry.name, &file_entry.stat) > - .await.context(format!("error at {:?}", self.path))?; > + .await.unique_context(format!("error at {:?}", self.path))?; > } > self.path = old_path; > self.entry_counter = entry_counter;