Replace FUSE's direct_mount option with mount_method

When enabling direct_mount, go-fuse attempts to create a FUSE mount
directly, using the mount(2) system call. If that fails, it falls back
to using the fusermount utility. What's annoying is that this causes any
errors returned by mount(2) to be suppressed. go-fuse solved this by
adding a DirectMountStrict option, which disables the fallback
behaviour.

This change exposes go-fuse's DirectMountStrict feature. Instead of
adding a separate boolean flag for it, we promote the existing
direct_mount configuration option to an enumeration named mount_method.
This means that if your configuration previously contained:

    directMount: true,

You need to replace it with either one of the lines below, depending on
whether you want to still fall back to calling fusermount:

    mountMethod: 'DIRECT',
    mountMethod: 'DIRECT_AND_FUSERMOUNT',

Fixes: buildbarn#156

Author: sfc-gh-guwang

pkg/filesystem/virtual/configuration/fuse_mount_enabled.go

@@ -8,12 +8,16 @@ import (
 
 	"github.com/buildbarn/bb-remote-execution/pkg/filesystem/virtual"
 	"github.com/buildbarn/bb-remote-execution/pkg/filesystem/virtual/fuse"
+	pb "github.com/buildbarn/bb-remote-execution/pkg/proto/configuration/filesystem/virtual"
 	"github.com/buildbarn/bb-storage/pkg/clock"
 	"github.com/buildbarn/bb-storage/pkg/filesystem"
 	"github.com/buildbarn/bb-storage/pkg/program"
 	"github.com/buildbarn/bb-storage/pkg/util"
 	go_fuse "github.com/hanwen/go-fuse/v2/fuse"
 	"github.com/jmespath/go-jmespath"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func (m *fuseMount) Expose(terminationGroup program.Group, rootDirectory virtual.Directory) error {
@@ -45,6 +49,35 @@ func (m *fuseMount) Expose(terminationGroup program.Group, rootDirectory virtual
 	// Launch the FUSE server.
 	removeStaleMounts(m.mountPath)
 	deterministicTimestamp := uint64(filesystem.DeterministicFileModificationTimestamp.Unix())
+	mountOptions := &go_fuse.MountOptions{
+		// The name isn't strictly necessary, but is
+		// filled in to prevent runc from crashing with
+		// this error:
+		// https://github.com/opencontainers/runc/blob/v1.0.0-rc10/libcontainer/mount/mount_linux.go#L69
+		//
+		// Newer versions of runc use an improved parser
+		// that's more reliable:
+		// https://github.com/moby/sys/blob/master/mountinfo/mountinfo_linux.go
+		FsName:     m.fsName,
+		AllowOther: m.configuration.AllowOther,
+		// Speed up workloads that perform many tiny
+		// writes. This means data is only guaranteed to
+		// make it into the virtual file system after
+		// calling close()/fsync()/munmap()/msync().
+		EnableWritebackCache: true,
+	}
+
+	switch m.configuration.MountMethod {
+	case pb.FUSEMountConfiguration_FUSERMOUNT:
+		// go-fuse uses fusermount by default.
+	case pb.FUSEMountConfiguration_DIRECT:
+		mountOptions.DirectMountStrict = true
+	case pb.FUSEMountConfiguration_DIRECT_AND_FUSERMOUNT:
+		mountOptions.DirectMount = true
+	default:
+		return status.Error(codes.InvalidArgument, "Invalid mount method")
+	}
+
 	server, err := go_fuse.NewServer(
 		fuse.NewMetricsRawFileSystem(
 			fuse.NewDefaultAttributesInjectingRawFileSystem(
@@ -61,24 +94,8 @@ func (m *fuseMount) Expose(terminationGroup program.Group, rootDirectory virtual
 				}),
 			clock.SystemClock),
 		m.mountPath,
-		&go_fuse.MountOptions{
-			// The name isn't strictly necessary, but is
-			// filled in to prevent runc from crashing with
-			// this error:
-			// https://github.com/opencontainers/runc/blob/v1.0.0-rc10/libcontainer/mount/mount_linux.go#L69
-			//
-			// Newer versions of runc use an improved parser
-			// that's more reliable:
-			// https://github.com/moby/sys/blob/master/mountinfo/mountinfo_linux.go
-			FsName:      m.fsName,
-			AllowOther:  m.configuration.AllowOther,
-			DirectMount: m.configuration.DirectMount,
-			// Speed up workloads that perform many tiny
-			// writes. This means data is only guaranteed to
-			// make it into the virtual file system after
-			// calling close()/fsync()/munmap()/msync().
-			EnableWritebackCache: true,
-		})
+		mountOptions,
+	)
 	if err != nil {
 		return util.StatusWrap(err, "Failed to create FUSE server")
 	}