mirror of
https://git.proxmox.com/git/proxmox-backup
synced 2025-08-11 11:01:23 +00:00
pxar: add UniqueContext helper
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>
This commit is contained in:
parent
095ddcad48
commit
230527a360
@ -1,5 +1,6 @@
|
|||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::ffi::{CStr, CString, OsStr};
|
use std::ffi::{CStr, CString, OsStr};
|
||||||
|
use std::fmt::Display;
|
||||||
use std::io::{self, Read};
|
use std::io::{self, Read};
|
||||||
use std::mem::size_of;
|
use std::mem::size_of;
|
||||||
use std::ops::Range;
|
use std::ops::Range;
|
||||||
@ -116,12 +117,32 @@ pub fn is_virtual_file_system(magic: i64) -> bool {
|
|||||||
SYSFS_MAGIC)
|
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)]
|
#[derive(Eq, PartialEq, Hash)]
|
||||||
pub(crate) struct HardLinkInfo {
|
pub(crate) struct HardLinkInfo {
|
||||||
st_dev: u64,
|
st_dev: u64,
|
||||||
@ -386,7 +407,7 @@ impl Archiver {
|
|||||||
&file_entry.stat,
|
&file_entry.stat,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.context(format!("error at {:?}", self.path))?;
|
.unique_context(format!("error at {:?}", self.path))?;
|
||||||
}
|
}
|
||||||
self.path = old_path;
|
self.path = old_path;
|
||||||
self.entry_counter = entry_counter;
|
self.entry_counter = entry_counter;
|
||||||
|
Loading…
Reference in New Issue
Block a user