lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mount: avoid comma in mount options

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/2719
This commit is contained in:
chrislu 2022-03-03 03:42:29 -08:00
parent dc0f48682c
commit f51e20028a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
weed/command/mount_std.go
View File

@ -49,10 +49,10 @@ func runMount(cmd *Command, args []string) bool {
return false return false
} }
return RunMount2(&mountOptions, os.FileMode(umask)) return RunMount(&mountOptions, os.FileMode(umask))
} }
func RunMount2(option *MountOptions, umask os.FileMode) bool { func RunMount(option *MountOptions, umask os.FileMode) bool {
// basic checks // basic checks
chunkSizeLimitMB := *mountOptions.chunkSizeLimitMB chunkSizeLimitMB := *mountOptions.chunkSizeLimitMB
@ -142,6 +142,8 @@ func RunMount2(option *MountOptions, umask os.FileMode) bool {
return true return true
} }
serverFriendlyName := strings.ReplaceAll(*option.filer, ",", "+")
// mount fuse // mount fuse
fuseMountOptions := &fuse.MountOptions{ fuseMountOptions := &fuse.MountOptions{
AllowOther: *option.allowOthers, AllowOther: *option.allowOthers,
@ -151,7 +153,7 @@ func RunMount2(option *MountOptions, umask os.FileMode) bool {
MaxReadAhead: 1024 * 1024 * 2, MaxReadAhead: 1024 * 1024 * 2,
IgnoreSecurityLabels: false, IgnoreSecurityLabels: false,
RememberInodes: false, RememberInodes: false,
FsName: *option.filer + ":" + filerMountRootPath, FsName: serverFriendlyName + ":" + filerMountRootPath,
Name: "seaweedfs", Name: "seaweedfs",
SingleThreaded: false, SingleThreaded: false,
DisableXAttrs: false, DisableXAttrs: false,
@ -183,7 +185,7 @@ func RunMount2(option *MountOptions, umask os.FileMode) bool {
fuseMountOptions.Options = append(fuseMountOptions.Options, "noapplexattr") fuseMountOptions.Options = append(fuseMountOptions.Options, "noapplexattr")
// fuseMountOptions.Options = append(fuseMountOptions.Options, "novncache") // need to test effectiveness // fuseMountOptions.Options = append(fuseMountOptions.Options, "novncache") // need to test effectiveness
fuseMountOptions.Options = append(fuseMountOptions.Options, "slow_statfs") fuseMountOptions.Options = append(fuseMountOptions.Options, "slow_statfs")
fuseMountOptions.Options = append(fuseMountOptions.Options, "volname="+*option.filer) fuseMountOptions.Options = append(fuseMountOptions.Options, "volname="+serverFriendlyName)
fuseMountOptions.Options = append(fuseMountOptions.Options, fmt.Sprintf("iosize=%d", ioSizeMB*1024*1024)) fuseMountOptions.Options = append(fuseMountOptions.Options, fmt.Sprintf("iosize=%d", ioSizeMB*1024*1024))
} }