diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/mount.go | 2 | ||||
| -rw-r--r-- | weed/command/mount_std.go | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/weed/command/mount.go b/weed/command/mount.go index 594c2833e..3201fbb13 100644 --- a/weed/command/mount.go +++ b/weed/command/mount.go @@ -33,7 +33,6 @@ type MountOptions struct { localSocket *string disableXAttr *bool extraOptions []string - writeOnceReadMany *bool } var ( @@ -71,7 +70,6 @@ func init() { mountOptions.debugPort = cmdMount.Flag.Int("debug.port", 6061, "http port for debugging") mountOptions.localSocket = cmdMount.Flag.String("localSocket", "", "default to /tmp/seaweedfs-mount-<mount_dir_hash>.sock") mountOptions.disableXAttr = cmdMount.Flag.Bool("disableXAttr", false, "disable xattr") - mountOptions.writeOnceReadMany = cmdMount.Flag.Bool("writeOnceReadMany", false, "write once, read many times") mountCpuProfile = cmdMount.Flag.String("cpuprofile", "", "cpu profile output file") mountMemProfile = cmdMount.Flag.String("memprofile", "", "memory profile output file") diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 53357eba6..0ab794bbd 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -6,6 +6,15 @@ package command import ( "context" "fmt" + "net" + "net/http" + "os" + "os/user" + "runtime" + "strconv" + "strings" + "time" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/mount" @@ -17,14 +26,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/security" "github.com/seaweedfs/seaweedfs/weed/storage/types" "google.golang.org/grpc/reflection" - "net" - "net/http" - "os" - "os/user" - "runtime" - "strconv" - "strings" - "time" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/grace" @@ -247,7 +248,6 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { Cipher: cipher, UidGidMapper: uidGidMapper, DisableXAttr: *option.disableXAttr, - WriteOnceReadMany: *option.writeOnceReadMany, }) // create mount root @@ -271,7 +271,11 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { reflection.Register(grpcS) go grpcS.Serve(montSocketListener) - seaweedFileSystem.StartBackgroundTasks() + err = seaweedFileSystem.StartBackgroundTasks() + if err != nil { + fmt.Printf("failed to start background tasks: %v\n", err) + return false + } glog.V(0).Infof("mounted %s%s to %v", *option.filer, mountRoot, dir) glog.V(0).Infof("This is SeaweedFS version %s %s %s", util.Version(), runtime.GOOS, runtime.GOARCH) |