Use the newer vectored read fuse library with backwards compatibility

yandex-cloud · Aug 31, 2021 · 8a91f33 · 8a91f33
1 parent 2edabe3
commit 8a91f33
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/api/api.go b/api/api.go
@@ -44,6 +44,7 @@ func Mount(
 		Options:                 flags.MountOptions,
 		ErrorLogger:             GetStdLogger(NewLogger("fuse"), logrus.ErrorLevel),
 		DisableWritebackCaching: true,
+		UseVectoredRead:         true,
 	}
 
 	if flags.DebugFuse {

diff --git a/api/common/panic_logger.go b/api/common/panic_logger.go
@@ -112,6 +112,10 @@ func (fs FusePanicLogger) ReadFile(ctx context.Context, op *fuseops.ReadFileOp)
 	defer LogPanic(&err)
 	return fs.Fs.ReadFile(ctx, op)
 }
+func (fs FusePanicLogger) VectoredRead(ctx context.Context, op *fuseops.VectoredReadOp) (err error) {
+	defer LogPanic(&err)
+	return fs.Fs.VectoredRead(ctx, op)
+}
 func (fs FusePanicLogger) WriteFile(ctx context.Context, op *fuseops.WriteFileOp) (err error) {
 	defer LogPanic(&err)
 	return fs.Fs.WriteFile(ctx, op)

diff --git a/go.mod b/go.mod
@@ -38,4 +38,4 @@ require (
 
 replace github.com/aws/aws-sdk-go => ./s3ext
 
-replace github.com/jacobsa/fuse => github.com/vitalif/fusego v0.0.0-20210827131224-604f0cac79eb
+replace github.com/jacobsa/fuse => github.com/vitalif/fusego v0.0.0-20210831101748-5c1104f25356
diff --git a/go.sum b/go.sum
@@ -263,6 +263,8 @@ github.com/urfave/cli v1.21.1-0.20190807111034-521735b7608a h1:Q372CokLjPoo4bx4q
 github.com/urfave/cli v1.21.1-0.20190807111034-521735b7608a/go.mod h1:pLnliFgEwGWwRKy8217bLxXBDmG6pBQeZcIzf+m7U+k=
 github.com/vitalif/fusego v0.0.0-20210827131224-604f0cac79eb h1:knaAaXtcWrH75aVO9UHSjjd81chemg/iA5aGCGSuEf8=
 github.com/vitalif/fusego v0.0.0-20210827131224-604f0cac79eb/go.mod h1:xtZnnLxHY6QniCrfIpTwr5h8mH8zr+jsOFj0y9cfyp4=
+github.com/vitalif/fusego v0.0.0-20210831101748-5c1104f25356 h1:Hkk91Dh5r5FobWTJ2e0Rj79oHbeHWRa7uNnUK4c4RHU=
+github.com/vitalif/fusego v0.0.0-20210831101748-5c1104f25356/go.mod h1:xtZnnLxHY6QniCrfIpTwr5h8mH8zr+jsOFj0y9cfyp4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/internal/goofys.go b/internal/goofys.go
@@ -1146,9 +1146,9 @@ func (fs *Goofys) OpenFile(
 	return
 }
 
-func (fs *Goofys) ReadFile(
+func (fs *Goofys) VectoredRead(
 	ctx context.Context,
-	op *fuseops.ReadFileOp) (err error) {
+	op *fuseops.VectoredReadOp) (err error) {
 
 	fs.mu.RLock()
 	fh := fs.fileHandles[op.Handle]

diff --git a/internal/goofys_test.go b/internal/goofys_test.go
@@ -1844,6 +1844,7 @@ func (s *GoofysTest) mountSame(t *C, mountPoint string, sameProc bool) {
 			Options:                 s.fs.flags.MountOptions,
 			ErrorLogger:             GetStdLogger(NewLogger("fuse"), logrus.ErrorLevel),
 			DisableWritebackCaching: true,
+			UseVectoredRead:         true,
 		}
 		mountCfg.DebugLogger = GetStdLogger(fuseLog, logrus.DebugLevel)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,4 @@ require (

		replace github.com/aws/aws-sdk-go => ./s3ext

		replace github.com/jacobsa/fuse => github.com/vitalif/fusego v0.0.0-20210827131224-604f0cac79eb
		replace github.com/jacobsa/fuse => github.com/vitalif/fusego v0.0.0-20210831101748-5c1104f25356