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

vfs: make WriteAt for non cached files work with non-sequential writes

Browse Source 
This makes WriteAt for non cached files wait a short time if it gets
an out of order write (which would normally cause an error) to see if
the gap will be filled with an in order write.

The makes the SFTP backend work fine with --vfs-cache-mode off
This commit is contained in:
Nick Craig-Wood 2019-05-10 13:22:55 +01:00
parent ada8c22a97
commit af030f74f5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vfs/write.go
View File

@ -121,11 +121,20 @@ func (fh *WriteFileHandle) WriteAt(p []byte, off int64) (n int, err error) {
// Implementatino of WriteAt - call with lock held
func (fh *WriteFileHandle) writeAt(p []byte, off int64) (n int, err error) {
// fs.Debugf(fh.remote, "WriteFileHandle.Write len=%d", len(p))
// defer log.Trace(fh.remote, "len=%d off=%d", len(p), off)("n=%d, fh.off=%d, err=%v", &n, &fh.offset, &err)
if fh.closed {
fs.Errorf(fh.remote, "WriteFileHandle.Write: error: %v", EBADF)
return 0, ECLOSED
}
// Wait a short time for sequential writes to appear
const maxTries = 1000
const sleepTime = 1 * time.Millisecond
for try := 1; fh.offset != off && try <= maxTries; try++ {
//fs.Debugf(fh.remote, "waiting for in sequence write %d/%d", try, maxTries)
fh.mu.Unlock()
time.Sleep(sleepTime)
fh.mu.Lock()
}
if fh.offset != off {
fs.Errorf(fh.remote, "WriteFileHandle.Write: can't seek in file without --vfs-cache-mode >= writes")
return 0, ESPIPE