TrueCloudLab/rclone
16
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

lib/file: retry preallocate on EINTR

Browse source 
Before this change, sometimes preallocate failed with EINTR which
rclone ignored.

Retrying the syscall is the correct thing to do and seems to make
preallocate 100% reliable.
This commit is contained in:
Nick Craig-Wood 2021-02-17 18:11:27 +00:00
parent 4b4e531846
commit 5e038a5e1e
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/file/preallocate_unix.go
View file

@ -6,6 +6,7 @@ import (
"os" "os"
"sync" "sync"
"sync/atomic" "sync/atomic"
"syscall"
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -25,19 +26,23 @@ var (
const PreallocateImplemented = true const PreallocateImplemented = true
// PreAllocate the file for performance reasons // PreAllocate the file for performance reasons
func PreAllocate(size int64, out *os.File) error { func PreAllocate(size int64, out *os.File) (err error) {
if size <= 0 { if size <= 0 {
return nil return nil
} }
preAllocateMu.Lock() preAllocateMu.Lock()
defer preAllocateMu.Unlock() defer preAllocateMu.Unlock()
for {
index := atomic.LoadInt32(&fallocFlagsIndex) index := atomic.LoadInt32(&fallocFlagsIndex)
again: again:
if index >= int32(len(fallocFlags)) { if index >= int32(len(fallocFlags)) {
return nil // Fallocate is disabled return nil // Fallocate is disabled
} }
flags := fallocFlags[index] flags := fallocFlags[index]
err := unix.Fallocate(int(out.Fd()), flags, 0, size) err = unix.Fallocate(int(out.Fd()), flags, 0, size)
if err == unix.ENOTSUP { if err == unix.ENOTSUP {
// Try the next flags combination // Try the next flags combination
index++ index++
@ -50,6 +55,10 @@ again:
if err == unix.ENOSPC { if err == unix.ENOSPC {
return ErrDiskFull return ErrDiskFull
} }
if err != syscall.EINTR {
break
}
}
return err return err
} }