octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-23 03:18:55 +00:00
Code Issues Releases Wiki Activity

internal/restic: Handle EINVAL for xattr on Solaris

Browse Source 
Also make the errors a bit less verbose by not prepending the operation,
since pkg/xattr already does that. Old errors looked like

    Listxattr: xattr.list /myfiles/.zfs/snapshot: invalid argument
This commit is contained in:
greatroar 2022-08-01 12:42:56 +02:00
parent b9fa6e05bd
commit ad6ac680af
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
internal/restic/node_xattr.go
View File

@ -13,31 +13,39 @@ import (
// Getxattr retrieves extended attribute data associated with path. // Getxattr retrieves extended attribute data associated with path.
func Getxattr(path, name string) ([]byte, error) { func Getxattr(path, name string) ([]byte, error) {
b, e := xattr.Get(path, name) b, err := xattr.Get(path, name)
if err, ok := e.(*xattr.Error); ok && return b, handleXattrErr(err)
(err.Err == syscall.ENOTSUP || err.Err == xattr.ENOATTR) {
return nil, nil
}
return b, errors.Wrap(e, "Getxattr")
} }
// Listxattr retrieves a list of names of extended attributes associated with the // Listxattr retrieves a list of names of extended attributes associated with the
// given path in the file system. // given path in the file system.
func Listxattr(path string) ([]string, error) { func Listxattr(path string) ([]string, error) {
s, e := xattr.List(path) l, err := xattr.List(path)
if err, ok := e.(*xattr.Error); ok && return l, handleXattrErr(err)
(err.Err == syscall.ENOTSUP || err.Err == xattr.ENOATTR) {
return nil, nil
}
return s, errors.Wrap(e, "Listxattr")
} }
// Setxattr associates name and data together as an attribute of path. // Setxattr associates name and data together as an attribute of path.
func Setxattr(path, name string, data []byte) error { func Setxattr(path, name string, data []byte) error {
e := xattr.Set(path, name, data) return handleXattrErr(xattr.Set(path, name, data))
if err, ok := e.(*xattr.Error); ok && }
(err.Err == syscall.ENOTSUP || err.Err == xattr.ENOATTR) {
func handleXattrErr(err error) error {
switch e := err.(type) {
case nil:
return nil
case *xattr.Error:
// On Solaris, xattr not being supported on a file is signaled
// by EINVAL (https://github.com/pkg/xattr/issues/67).
// On Linux, xattr calls on files in an SMB/CIFS mount can return
// ENOATTR instead of ENOTSUP.
switch e.Err {
case syscall.EINVAL, syscall.ENOTSUP, xattr.ENOATTR:
return nil return nil
} }
return errors.Wrap(e, "Setxattr") return errors.WithStack(e)
default:
return errors.WithStack(e)
}
} }