"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
mount2: fix empty directory listings on re-read
Janne Beate Bakeng00bd00d83d69
diff --git a/cmd/mount2/node.go b/cmd/mount2/node.goindex 782e8988b..b18d86929 100644--- a/cmd/mount2/node.go+++ b/cmd/mount2/node.go@@ -271,7 +271,20 @@ func (ds *dirStream) Next() (de fuse.DirEntry, errno syscall.Errno) {func (ds *dirStream) Close() {}+// Seekdir implements fusefs.FileSeekdirer so go-fuse can rewind the directory+// stream when the kernel calls lseek(fd, 0, SEEK_SET) before a second getdents.+// Without this, go-fuse returns ENOTSUP and ls returns empty on every call after+// the first. See: https://github.com/hanwen/go-fuse/issues/549+func (ds *dirStream) Seekdir(_ context.Context, off uint64) syscall.Errno {+ if off == 0 {+ ds.i = 0+ return 0+ }+ return syscall.ENOTSUP+}+var _ fusefs.DirStream = (*dirStream)(nil)+var _ fusefs.FileSeekdirer = (*dirStream)(nil)// Readdir opens a stream of directory entries.//diff --git a/vfs/vfstest/dir_non_unix.go b/vfs/vfstest/dir_non_unix.gonew file mode 100644index 000000000..a54d552c9--- /dev/null+++ b/vfs/vfstest/dir_non_unix.go@@ -0,0 +1,13 @@+//go:build !linux && !darwin && !freebsd++package vfstest++import (+ "runtime"+ "testing"+)++// TestDirRewind checks that re-reading a rewound directory works+func TestDirRewind(t *testing.T) {+ t.Skip("not supported on " + runtime.GOOS)+}diff --git a/vfs/vfstest/dir_unix.go b/vfs/vfstest/dir_unix.gonew file mode 100644index 000000000..e1fad0e1c--- /dev/null+++ b/vfs/vfstest/dir_unix.go@@ -0,0 +1,75 @@+//go:build linux || darwin || freebsd++package vfstest++import (+ "syscall"+ "testing"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++// countDirFd reads the directory referred to by fd to end-of-stream using+// raw getdents syscalls and returns the number of entries (excluding "." and+// ".." which ParseDirent skips).+//+// This deliberately uses syscall.ReadDirent rather than (*os.File).Readdir so+// that it exercises the kernel readdir path directly on a single file+// descriptor, the same way an in-process rewinddir does.+func countDirFd(t *testing.T, fd int) int {+ buf := make([]byte, 8192)+ var names []string+ for {+ n, err := syscall.ReadDirent(fd, buf)+ require.NoError(t, err)+ if n <= 0 {+ break+ }+ _, _, names = syscall.ParseDirent(buf[:n], -1, names)+ }+ return len(names)+}++// TestDirRewind checks that re-reading a directory after rewinding the+// directory stream (lseek(fd, 0, SEEK_SET), as rewinddir(3) does) returns the+// same entries as the first read.+//+// This reproduces the bug where the mount2 backend returned an empty listing+// on every read after the first because go-fuse v2.9.0 rewinds a directory by+// calling Seekdir, which dirStream did not implement. See PR #9469 and+// https://github.com/hanwen/go-fuse/issues/549+func TestDirRewind(t *testing.T) {+ run.skipIfVFS(t)+ run.skipIfNoFUSE(t)++ run.mkdir(t, "dir")+ run.createFile(t, "dir/f1", "1")+ run.createFile(t, "dir/f2", "2")+ run.createFile(t, "dir/f3", "3")+ run.checkDir(t, "dir/|dir/f1 1|dir/f2 1|dir/f3 1")++ fh, err := run.os.Open(run.path("dir"))+ require.NoError(t, err)+ defer func() {+ _ = fh.Close()+ }()+ fd := int(fh.Fd())++ first := countDirFd(t, fd)+ assert.Equal(t, 3, first, "first read should see all entries")++ // rewinddir == lseek(fd, 0, SEEK_SET)+ _, err = syscall.Seek(fd, 0, 0)+ require.NoError(t, err)++ second := countDirFd(t, fd)+ assert.Equal(t, first, second, "re-read after rewind should match first read")++ require.NoError(t, fh.Close())+ run.rm(t, "dir/f1")+ run.rm(t, "dir/f2")+ run.rm(t, "dir/f3")+ run.rmdir(t, "dir")+ run.checkDir(t, "")+}diff --git a/vfs/vfstest/fs.go b/vfs/vfstest/fs.goindex 3048dacbb..61f2926ea 100644--- a/vfs/vfstest/fs.go+++ b/vfs/vfstest/fs.go@@ -86,6 +86,7 @@ func RunTests(t *testing.T, useVFS bool, minimumRequiredCacheMode vfscommon.Cacht.Run("TestDirRenameEmptyDir", TestDirRenameEmptyDir)t.Run("TestDirRenameFullDir", TestDirRenameFullDir)t.Run("TestDirModTime", TestDirModTime)+ t.Run("TestDirRewind", TestDirRewind)if enableCacheTests {t.Run("TestDirCacheFlush", TestDirCacheFlush)}