From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v3 3/4] pxar: add UniqueContext helper
Date: Mon, 17 Jun 2024 10:12:53 +0200 [thread overview]
Message-ID: <20240617081259.73805-4-g.goller@proxmox.com> (raw)
In-Reply-To: <20240617081259.73805-1-g.goller@proxmox.com>
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 <g.goller@proxmox.com>
---
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<T> {
+ fn unique_context<S>(self, context: S) -> Result<T, anyhow::Error>
+ where
+ S: Display + Send + Sync + 'static;
}
+impl<T> UniqueContext<T> for Result<T, anyhow::Error> {
+ fn unique_context<S>(self, context: S) -> Result<T, anyhow::Error>
+ 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
next prev parent reply other threads:[~2024-06-17 8:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 8:12 [pbs-devel] [PATCH proxmox{, -backup} v3 0/4] output full anyhow context in client Gabriel Goller
2024-06-17 8:12 ` [pbs-devel] [PATCH proxmox v3 1/4] CLI: print fatal errors including causes Gabriel Goller
2024-06-18 13:42 ` Wolfgang Bumiller
2024-06-18 14:21 ` Gabriel Goller
2024-06-17 8:12 ` [pbs-devel] [PATCH proxmox-backup v3 2/4] pxar: remove ArchiveError Gabriel Goller
2024-06-17 8:12 ` Gabriel Goller [this message]
2024-06-17 8:12 ` [pbs-devel] [PATCH proxmox-backup v3 4/4] pxar: use anyhow::Error in PxarBackupStream Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240617081259.73805-4-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox