tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/pxar/encoder.rs: Don't bail if endpoint does not support xattrs.

Browse Source 
The encoder bailed if a endpoint which did not support xattrs was encountered.
Instead of bailing, we ignore these errors and simply do not store xattrs for
such endpoints.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-05-27 13:01:38 +02:00 committed by Dietmar Maurer
parent a42fa400ee
commit 578b601159
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pxar/encoder.rs
View File

@ -238,6 +238,10 @@ impl <'a, W: Write> Encoder<'a, W> {
let xattr_names = match xattr::flistxattr(fd) { let xattr_names = match xattr::flistxattr(fd) {
Ok(names) => names, Ok(names) => names,
// Do not bail if the underlying endpoint does not supports xattrs
Err(Errno::EOPNOTSUPP) => return Ok((xattrs, fcaps)),
// Do not bail if the endpoint cannot carry xattrs (such as symlinks)
Err(Errno::EBADF) => return Ok((xattrs, fcaps)),
Err(err) => bail!("read_xattrs failed for {:?} - {}", self.full_path(), err), Err(err) => bail!("read_xattrs failed for {:?} - {}", self.full_path(), err),
}; };
@ -293,8 +297,16 @@ impl <'a, W: Write> Encoder<'a, W> {
// to create a path for acl_get_file(). acl_get_fd() only allows to get // to create a path for acl_get_file(). acl_get_fd() only allows to get
// ACL_TYPE_ACCESS attributes. // ACL_TYPE_ACCESS attributes.
let proc_path = Path::new("/proc/self/fd/").join(fd.to_string()); let proc_path = Path::new("/proc/self/fd/").join(fd.to_string());
let acl = acl::ACL::get_file(&proc_path, acl_type) let acl = match acl::ACL::get_file(&proc_path, acl_type) {
.map_err(|err| format_err!("error while reading ACL - {}", err))?; Ok(acl) => acl,
// Don't bail if underlying endpoint does not support acls
Err(Errno::EOPNOTSUPP) => return Ok(ret),
// Don't bail if the endpoint cannot carry acls
Err(Errno::EBADF) => return Ok(ret),
// Don't bail if there is no data
Err(Errno::ENODATA) => return Ok(ret),
Err(err) => bail!("error while reading ACL - {}", err),
};
self.process_acl(acl, acl_type) self.process_acl(acl, acl_type)
} }