potyarkin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

sync: fix expecting SFTP to have MkdirMetadata method: optional feature not implemented

Browse source 
Before this fix we attempted to copy metadata to SFTP backends despite
them not being capable of it.

This fixes the problem by making the need to copy metadata explicit
rather than implicit in a value being present or not.
This commit is contained in:
Nick Craig-Wood 2024-06-08 12:38:31 +01:00
parent 57f5ad188b
commit 39f8d039fe
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/sync/sync.go
View file

@ -98,7 +98,7 @@ type syncCopyMove struct {
// For keeping track of delayed modtime sets // For keeping track of delayed modtime sets
type setDirModTime struct { type setDirModTime struct {
src fs.Directory // if set the metadata should be set too src fs.Directory
dst fs.Directory dst fs.Directory
dir string dir string
modTime time.Time modTime time.Time
@ -1109,7 +1109,6 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
if !s.setDirModTimeAfter && equal { if !s.setDirModTimeAfter && equal {
return nil return nil
} }
setMeta := true
if s.setDirModTimeAfter && equal { if s.setDirModTimeAfter && equal {
newDst = dst newDst = dst
} else if s.copyEmptySrcDirs { } else if s.copyEmptySrcDirs {
@ -1126,7 +1125,6 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
err = operations.Mkdir(ctx, f, dir) err = operations.Mkdir(ctx, f, dir)
} }
} else { } else {
setMeta = s.setDirMetadata
newDst = dst newDst = dst
} }
// If we need to set modtime after and we created a dir, then save it for later // If we need to set modtime after and we created a dir, then save it for later
@ -1145,14 +1143,12 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
s.setDirModTimesMaxLevel = level s.setDirModTimesMaxLevel = level
} }
set := setDirModTime{ set := setDirModTime{
src: src,
dst: newDst, dst: newDst,
dir: dir, dir: dir,
modTime: src.ModTime(ctx), modTime: src.ModTime(ctx),
level: level, level: level,
} }
if setMeta {
set.src = src
}
s.setDirModTimes = append(s.setDirModTimes, set) s.setDirModTimes = append(s.setDirModTimes, set)
s.setDirModTimeMu.Unlock() s.setDirModTimeMu.Unlock()
fs.Debugf(nil, "Added delayed dir = %q, newDst=%v", dir, newDst) fs.Debugf(nil, "Added delayed dir = %q, newDst=%v", dir, newDst)
@ -1202,8 +1198,7 @@ func (s *syncCopyMove) setDelayedDirModTimes(ctx context.Context) error {
} }
g.Go(func() error { g.Go(func() error {
var err error var err error
// if item.src is set must copy full metadata if s.setDirMetadata {
if item.src != nil {
_, err = operations.CopyDirMetadata(gCtx, s.fdst, item.dst, item.dir, item.src) _, err = operations.CopyDirMetadata(gCtx, s.fdst, item.dst, item.dir, item.src)
} else { } else {
_, err = operations.SetDirModTime(gCtx, s.fdst, item.dst, item.dir, item.modTime) _, err = operations.SetDirModTime(gCtx, s.fdst, item.dst, item.dir, item.modTime)