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_linux.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_linux.go')
| -rw-r--r-- | weed/command/mount_linux.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/weed/command/mount_linux.go b/weed/command/mount_linux.go index 7d94e5142..591951d4f 100644 --- a/weed/command/mount_linux.go +++ b/weed/command/mount_linux.go @@ -1,6 +1,7 @@ package command import ( + "github.com/chrislusf/seaweedfs/weed/util" "github.com/seaweedfs/fuse" ) @@ -9,3 +10,16 @@ func osSpecificMountOptions() []fuse.MountOption { fuse.AllowNonEmptyMount(), } } + +func checkMountPointAvailable(dir string) bool { + mountPoint := dir + if mountPoint != "/" && strings.HasSuffix(mountPoint, "/") { + mountPoint = mountPoint[0 : len(mountPoint)-1] + } + + if mounted, err := util.Mounted(mountPoint); err != nil || mounted { + return false + } + + return true +} |
