diff options
| author | Lei Liu <lei01.liu@horizon.ai> | 2019-11-14 14:26:59 +0800 |
|---|---|---|
| committer | Lei Liu <liul.stone@gmail.com> | 2019-11-27 22:56:44 +0800 |
| commit | 4c87b222f14cccd514045753178b182705a6c213 (patch) | |
| tree | a29b49dbb68f09977b79d76a07adddb5e6874d20 /weed/command/mount_std.go | |
| parent | 0f9ba84274d54cc69e3f592c6c2b058fca9a57e8 (diff) | |
| download | seaweedfs-4c87b222f14cccd514045753178b182705a6c213.tar.xz seaweedfs-4c87b222f14cccd514045753178b182705a6c213.zip | |
fuse: check mount point available before do runmount
1. Use more readable mount point information
2. Fix some typos
eg:
$ df -Th
Filesystem Type Size Used Avail Use% Mounted on
localhost:8888:/ fuse.seaweedfs 206G 512 206G 1% /mnt/weedfs
$ mount | grep weedfs
localhost:8888:/ on /mnt/weedfs type fuse.seaweedfs (rw,nodev,relatime,user_id=0,group_id=0,default_permissions,allow_other)
Signed-off-by: Lei Liu <lei01.liu@horizon.ai>
Diffstat (limited to 'weed/command/mount_std.go')
| -rw-r--r-- | weed/command/mount_std.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 6ca9bfdca..8cc0586ce 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -12,15 +12,14 @@ import ( "strings" "time" - "github.com/chrislusf/seaweedfs/weed/security" - "github.com/jacobsa/daemonize" - "github.com/spf13/viper" - "github.com/chrislusf/seaweedfs/weed/filesys" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/jacobsa/daemonize" "github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse/fs" + "github.com/spf13/viper" ) func runMount(cmd *Command, args []string) bool { @@ -88,12 +87,17 @@ func RunMount(filer, filerMountRootPath, dir, collection, replication, dataCente } } + if isValid := checkMountPointAvailable(dir); !isValid { + glog.Fatalf("Expected mount to still be active, target mount point: %s, please check!", dir) + return false + } + mountName := path.Base(dir) options := []fuse.MountOption{ fuse.VolumeName(mountName), - fuse.FSName("SeaweedFS"), - fuse.Subtype("SeaweedFS"), + fuse.FSName(filer + ":" + filerMountRootPath), + fuse.Subtype("seaweedfs"), fuse.NoAppleDouble(), fuse.NoAppleXattr(), fuse.NoBrowse(), |