mirror of
https://github.com/rclone/rclone
synced 2024-09-08 02:45:34 +02:00
local: fix preallocate warning on Linux with ZFS
Under Linux, rclone attempts to preallocate files for efficiency. Before this change, pre-allocation would fail on ZFS with the error Failed to pre-allocate: operation not supported After this change rclone tries a different flag combination for ZFS then disables pre-allocate if that doesn't work. Fixes #3066
This commit is contained in:
parent
62681e45fb
commit
5a941cdcdc
@ -4,16 +4,40 @@ package local
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"sync/atomic"
|
||||||
|
|
||||||
|
"github.com/ncw/rclone/fs"
|
||||||
"golang.org/x/sys/unix"
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
fallocFlags = [...]uint32{
|
||||||
|
unix.FALLOC_FL_KEEP_SIZE, // Default
|
||||||
|
unix.FALLOC_FL_KEEP_SIZE | unix.FALLOC_FL_PUNCH_HOLE, // for ZFS #3066
|
||||||
|
}
|
||||||
|
fallocFlagsIndex int32
|
||||||
|
)
|
||||||
|
|
||||||
// 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) error {
|
||||||
if size <= 0 {
|
if size <= 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
err := unix.Fallocate(int(out.Fd()), unix.FALLOC_FL_KEEP_SIZE, 0, size)
|
index := atomic.LoadInt32(&fallocFlagsIndex)
|
||||||
|
again:
|
||||||
|
if index >= int32(len(fallocFlags)) {
|
||||||
|
return nil // Fallocate is disabled
|
||||||
|
}
|
||||||
|
flags := fallocFlags[index]
|
||||||
|
err := unix.Fallocate(int(out.Fd()), flags, 0, size)
|
||||||
|
if err == unix.ENOTSUP {
|
||||||
|
// Try the next flags combination
|
||||||
|
index++
|
||||||
|
atomic.StoreInt32(&fallocFlagsIndex, index)
|
||||||
|
fs.Debugf(nil, "preAllocate: got error on fallocate, trying combination %d/%d: %v", index, len(fallocFlags), err)
|
||||||
|
goto again
|
||||||
|
|
||||||
|
}
|
||||||
// FIXME could be doing something here
|
// FIXME could be doing something here
|
||||||
// if err == unix.ENOSPC {
|
// if err == unix.ENOSPC {
|
||||||
// log.Printf("No space")
|
// log.Printf("No space")
|
||||||
|
Loading…
Reference in New Issue
Block a user