github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 20:49:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: don't open the file when using a RW handle for a null Seek

Browse Source 
Background: cmd/mount/file.go Open() function does a Seek(0, 1) to see
if the file handle is seekable to set a FUSE hint.  Before this change
the file was downloaded before it needed to be which was inefficient
(and broke beta.rclone.org because HEAD requests caused downloads!).
This commit is contained in:
Nick Craig-Wood 2018-02-22 17:28:21 +00:00
parent 1383df4f58
commit 9252224d82
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vfs/read_write.go
View File

@ -401,6 +401,9 @@ func (fh *RWFileHandle) Seek(offset int64, whence int) (ret int64, err error) {
if fh.closed { if fh.closed {
return 0, ECLOSED return 0, ECLOSED
} }
if !fh.opened && offset == 0 && whence != 2 {
return 0, nil
}
if err = fh.openPending(false); err != nil { if err = fh.openPending(false); err != nil {
return ret, err return ret, err
} }

14
vfs/read_write_test.go
View File

@ -110,10 +110,22 @@ func TestRWFileHandleSeek(t *testing.T) {
vfs, fh := rwHandleCreateReadOnly(t, r) vfs, fh := rwHandleCreateReadOnly(t, r)
defer cleanup(t, r, vfs) defer cleanup(t, r, vfs)
assert.Equal(t, fh.opened, false)
// Check null seeks don't open the file
n, err := fh.Seek(0, 0)
assert.NoError(t, err)
assert.Equal(t, int64(0), n)
assert.Equal(t, fh.opened, false)
n, err = fh.Seek(0, 1)
assert.NoError(t, err)
assert.Equal(t, int64(0), n)
assert.Equal(t, fh.opened, false)
assert.Equal(t, "0", rwReadString(t, fh, 1)) assert.Equal(t, "0", rwReadString(t, fh, 1))
// 0 means relative to the origin of the file, // 0 means relative to the origin of the file,
n, err := fh.Seek(5, 0) n, err = fh.Seek(5, 0)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, int64(5), n) assert.Equal(t, int64(5), n)
assert.Equal(t, "5", rwReadString(t, fh, 1)) assert.Equal(t, "5", rwReadString(t, fh, 1))