Skip to content

vfs: persist posix metadata #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denis-kudelin merged 1 commit into from
Oct 18, 2025
Merged

vfs: persist posix metadata #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 74 additions & 6 deletions cmd/mount/dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/log"
"github.com/rclone/rclone/vfs"
"github.com/rclone/rclone/vfs/vfscommon"
"github.com/rclone/rclone/vfs/vfsmeta"
)

// Dir represents a directory entry
Expand All @@ -39,6 +41,31 @@ func (d *Dir) Attr(ctx context.Context, a *fuse.Attr) (err error) {
a.Atime = modTime
a.Mtime = modTime
a.Ctime = modTime
opt := d.VFS().Opt
if opt.PersistMetadataEnabled() {
if m, err2 := d.VFS().LoadMetadata(ctx, d.Path(), true); err2 == nil {
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldMode) && m.Mode != nil {
perm := os.FileMode(*m.Mode) & os.ModePerm
a.Mode = (a.Mode & os.ModeType) | perm
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) {
if m.UID != nil {
a.Uid = *m.UID
}
if m.GID != nil {
a.Gid = *m.GID
}
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) {
if m.Mtime != nil {
a.Mtime = m.Mtime.UTC()
}
if m.Atime != nil {
a.Atime = m.Atime.UTC()
}
}
}
}
// FIXME include Valid so get some caching?
// FIXME fs.Debugf(d.path, "Dir.Attr %+v", a)
return nil
Expand All @@ -50,14 +77,55 @@ var _ fusefs.NodeSetattrer = (*Dir)(nil)
// Setattr handles attribute changes from FUSE. Currently supports ModTime only.
func (d *Dir) Setattr(ctx context.Context, req *fuse.SetattrRequest, resp *fuse.SetattrResponse) (err error) {
defer log.Trace(d, "stat=%+v", req)("err=%v", &err)
if d.VFS().Opt.NoModTime {
return nil
opt := d.VFS().Opt
if !opt.NoModTime {
if req.Valid.MtimeNow() {
err = d.SetModTime(time.Now())
} else if req.Valid.Mtime() {
err = d.SetModTime(req.Mtime)
}
}

if req.Valid.MtimeNow() {
err = d.SetModTime(time.Now())
} else if req.Valid.Mtime() {
err = d.SetModTime(req.Mtime)
if opt.PersistMetadataEnabled() {
var m vfsmeta.Meta
changed := false
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldMode) && req.Valid.Mode() {
v := uint32(req.Mode)
m.Mode = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) && req.Valid.Uid() {
v := req.Uid
m.UID = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) && req.Valid.Gid() {
v := req.Gid
m.GID = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) && (req.Valid.Atime() || req.Valid.AtimeNow()) {
t := req.Atime
if req.Valid.AtimeNow() {
t = time.Now()
}
m.Atime = &t
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) && (req.Valid.Mtime() || req.Valid.MtimeNow()) {
t := req.Mtime
if req.Valid.MtimeNow() {
t = time.Now()
}
m.Mtime = &t
changed = true
}
if changed {
if err2 := d.VFS().SaveMetadata(ctx, d.Path(), true, m); err2 != nil {
fs.Debugf(d, "persist metadata failed: %v", err2)
}
_ = d.fsys.server.InvalidateNodeAttr(d)
}
}

return translateError(err)
Expand Down
90 changes: 85 additions & 5 deletions cmd/mount/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ import (

"bazil.org/fuse"
fusefs "bazil.org/fuse/fs"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/log"
"github.com/rclone/rclone/vfs"
"github.com/rclone/rclone/vfs/vfscommon"
"github.com/rclone/rclone/vfs/vfsmeta"
)

// File represents a file
Expand All @@ -37,6 +40,32 @@ func (f *File) Attr(ctx context.Context, a *fuse.Attr) (err error) {
a.Atime = modTime
a.Mtime = modTime
a.Ctime = modTime
opt := f.VFS().Opt
if opt.PersistMetadataEnabled() {
if m, err2 := f.VFS().LoadMetadata(ctx, f.Path(), false); err2 == nil {
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldMode) && m.Mode != nil {
perm := os.FileMode(*m.Mode) & os.ModePerm
a.Mode = (a.Mode & os.ModeType) | perm
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) {
if m.UID != nil {
a.Uid = *m.UID
}
if m.GID != nil {
a.Gid = *m.GID
}
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) {
if m.Mtime != nil {
a.Mtime = m.Mtime.UTC()
}
if m.Atime != nil {
a.Atime = m.Atime.UTC()
}
}
}
}

a.Blocks = Blocks
return nil
}
Expand All @@ -47,15 +76,66 @@ var _ fusefs.NodeSetattrer = (*File)(nil)
// Setattr handles attribute changes from FUSE. Currently supports ModTime and Size only
func (f *File) Setattr(ctx context.Context, req *fuse.SetattrRequest, resp *fuse.SetattrResponse) (err error) {
defer log.Trace(f, "a=%+v", req)("err=%v", &err)
if !f.VFS().Opt.NoModTime {
opt := f.VFS().Opt

if req.Valid.Size() {
if e := f.File.Truncate(int64(req.Size)); err == nil {
err = e
}
}

if !opt.NoModTime {
if req.Valid.Mtime() {
err = f.File.SetModTime(req.Mtime)
if e := f.File.SetModTime(req.Mtime); err == nil {
err = e
}
} else if req.Valid.MtimeNow() {
err = f.File.SetModTime(time.Now())
if e := f.File.SetModTime(time.Now()); err == nil {
err = e
}
}
}
if req.Valid.Size() {
err = f.File.Truncate(int64(req.Size))

if opt.PersistMetadataEnabled() {
var m vfsmeta.Meta
changed := false
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldMode) && req.Valid.Mode() {
v := uint32(req.Mode)
m.Mode = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) && req.Valid.Uid() {
v := req.Uid
m.UID = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldOwner) && req.Valid.Gid() {
v := req.Gid
m.GID = &v
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) && (req.Valid.Atime() || req.Valid.AtimeNow()) {
t := req.Atime
if req.Valid.AtimeNow() {
t = time.Now()
}
m.Atime = &t
changed = true
}
if opt.PersistMetadataIncludes(vfscommon.MetadataFieldTimes) && (req.Valid.Mtime() || req.Valid.MtimeNow()) {
t := req.Mtime
if req.Valid.MtimeNow() {
t = time.Now()
}
m.Mtime = &t
changed = true
}
if changed {
if err2 := f.VFS().SaveMetadata(ctx, f.Path(), false, m); err2 != nil {
fs.Debugf(f, "persist metadata failed: %v", err2)
}
_ = f.fsys.server.InvalidateNodeAttr(f)
}
}
return translateError(err)
}
Expand Down
Loading