mirror of
https://github.com/rclone/rclone.git
synced 2024-11-22 08:23:47 +01:00
cache: notify vfs when using temp fs - fixes #2051
This commit is contained in:
parent
846bbef1e9
commit
54724a1362
46
backend/cache/cache.go
vendored
46
backend/cache/cache.go
vendored
@ -470,6 +470,14 @@ func (f *Fs) notifyDirChange(remote string) {
|
||||
f.notifyDirChangeUpstream(cd.Remote())
|
||||
}
|
||||
|
||||
// notifyDirChangeUpstreamIfNeeded will check if the wrapped remote doesn't notify on dir changes
|
||||
// or if we use a temp fs
|
||||
func (f *Fs) notifyDirChangeUpstreamIfNeeded(remote string) {
|
||||
if f.Fs.Features().DirChangeNotify == nil || f.tempWritePath != "" {
|
||||
f.notifyDirChangeUpstream(remote)
|
||||
}
|
||||
}
|
||||
|
||||
// notifyDirChangeUpstream will loop through all the upstreams and notify
|
||||
// of the provided remote (should be only a dir)
|
||||
func (f *Fs) notifyDirChangeUpstream(remote string) {
|
||||
@ -752,9 +760,7 @@ func (f *Fs) Mkdir(dir string) error {
|
||||
fs.Infof(parentCd, "mkdir: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -824,9 +830,7 @@ func (f *Fs) Rmdir(dir string) error {
|
||||
fs.Infof(parentCd, "rmdir: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -924,9 +928,7 @@ func (f *Fs) DirMove(src fs.Fs, srcRemote, dstRemote string) error {
|
||||
fs.Debugf(srcParent, "dirmove: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(srcParent.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(srcParent.Remote())
|
||||
|
||||
// expire parent dir at the destination path
|
||||
dstParent := NewDirectory(f, cleanPath(path.Dir(dstRemote)))
|
||||
@ -937,9 +939,7 @@ func (f *Fs) DirMove(src fs.Fs, srcRemote, dstRemote string) error {
|
||||
fs.Debugf(dstParent, "dirmove: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(dstParent.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(dstParent.Remote())
|
||||
// TODO: precache dst dir and save the chunks
|
||||
|
||||
return nil
|
||||
@ -1062,10 +1062,8 @@ func (f *Fs) put(in io.Reader, src fs.ObjectInfo, options []fs.OpenOption, put p
|
||||
} else {
|
||||
fs.Infof(parentCd, "put: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
// advertise to DirChangeNotify
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
|
||||
return cachedObj, nil
|
||||
}
|
||||
@ -1155,9 +1153,7 @@ func (f *Fs) Copy(src fs.Object, remote string) (fs.Object, error) {
|
||||
fs.Infof(parentCd, "copy: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
// expire src parent
|
||||
srcParent := NewDirectory(f, cleanPath(path.Dir(src.Remote())))
|
||||
err = f.cache.ExpireDir(srcParent)
|
||||
@ -1167,9 +1163,7 @@ func (f *Fs) Copy(src fs.Object, remote string) (fs.Object, error) {
|
||||
fs.Infof(srcParent, "copy: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(srcParent.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(srcParent.Remote())
|
||||
|
||||
return co, nil
|
||||
}
|
||||
@ -1255,9 +1249,7 @@ func (f *Fs) Move(src fs.Object, remote string) (fs.Object, error) {
|
||||
fs.Infof(parentCd, "move: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
// persist new
|
||||
cachedObj := ObjectFromOriginal(f, obj).persist()
|
||||
fs.Debugf(cachedObj, "move: added to cache")
|
||||
@ -1270,9 +1262,7 @@ func (f *Fs) Move(src fs.Object, remote string) (fs.Object, error) {
|
||||
fs.Infof(parentCd, "move: cache expired")
|
||||
}
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if f.Fs.Features().DirChangeNotify == nil {
|
||||
f.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
f.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
|
||||
return cachedObj, nil
|
||||
}
|
||||
|
18
backend/cache/cache_internal_test.go
vendored
18
backend/cache/cache_internal_test.go
vendored
@ -313,6 +313,24 @@ func TestInternalCachedWrittenContentMatches(t *testing.T) {
|
||||
require.Equal(t, checkSample, testSample)
|
||||
}
|
||||
|
||||
func TestInternalDoubleWrittenContentMatches(t *testing.T) {
|
||||
id := fmt.Sprintf("tidwcm%v", time.Now().Unix())
|
||||
rootFs, boltDb := runInstance.newCacheFs(t, remoteName, id, false, true, nil, nil)
|
||||
defer runInstance.cleanupFs(t, rootFs, boltDb)
|
||||
|
||||
// write the object
|
||||
runInstance.writeRemoteString(t, rootFs, "one", "one content")
|
||||
err := runInstance.updateData(t, rootFs, "one", "one content", " updated")
|
||||
require.NoError(t, err)
|
||||
err = runInstance.updateData(t, rootFs, "one", "one content updated", " double")
|
||||
require.NoError(t, err)
|
||||
|
||||
// check sample of data from in-file
|
||||
data, err := runInstance.readDataFromRemote(t, rootFs, "one", int64(0), int64(len("one content updated double")), true)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, "one content updated double", string(data))
|
||||
}
|
||||
|
||||
func TestInternalCachedUpdatedContentMatches(t *testing.T) {
|
||||
id := fmt.Sprintf("ticucm%v", time.Now().Unix())
|
||||
rootFs, boltDb := runInstance.newCacheFs(t, remoteName, id, false, true, nil, nil)
|
||||
|
4
backend/cache/object.go
vendored
4
backend/cache/object.go
vendored
@ -275,9 +275,7 @@ func (o *Object) Remove() error {
|
||||
parentCd := NewDirectory(o.CacheFs, cleanPath(path.Dir(o.Remote())))
|
||||
_ = o.CacheFs.cache.ExpireDir(parentCd)
|
||||
// advertise to DirChangeNotify if wrapped doesn't do that
|
||||
if o.CacheFs.Fs.Features().DirChangeNotify == nil {
|
||||
o.CacheFs.notifyDirChangeUpstream(parentCd.Remote())
|
||||
}
|
||||
o.CacheFs.notifyDirChangeUpstreamIfNeeded(parentCd.Remote())
|
||||
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user