diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-01-25 09:10:20 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-01-25 09:10:20 -0800 |
| commit | 62ebb917e016b0e0ad87f79540328fe209dd5707 (patch) | |
| tree | b1c076ed6da5f2edea02c2fb309b0efa7affa006 | |
| parent | 17f7c1c43f8adc1d1e4d795f23cdf60aa0e57c95 (diff) | |
| download | seaweedfs-62ebb917e016b0e0ad87f79540328fe209dd5707.tar.xz seaweedfs-62ebb917e016b0e0ad87f79540328fe209dd5707.zip | |
mount: avoid the need to specify different cache directory for different mount
fix https://github.com/seaweedfs/seaweedfs-csi-driver/issues/11
| -rw-r--r-- | weed/command/mount_std.go | 1 | ||||
| -rw-r--r-- | weed/filesys/wfs.go | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index a95ecd567..23f224cc2 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -169,6 +169,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { } seaweedFileSystem := filesys.NewSeaweedFileSystem(&filesys.Option{ + MountDirectory: dir, FilerAddress: filer, FilerGrpcAddress: filerGrpcAddress, GrpcDialOption: grpcDialOption, diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 236ecdacb..6cfadcc18 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -26,6 +26,7 @@ import ( ) type Option struct { + MountDirectory string FilerAddress string FilerGrpcAddress string GrpcDialOption grpc.DialOption @@ -92,7 +93,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { }, signature: util.RandomInt32(), } - cacheUniqueId := util.Md5String([]byte(option.FilerGrpcAddress + option.FilerMountRootPath + util.Version()))[0:4] + cacheUniqueId := util.Md5String([]byte(option.MountDirectory + option.FilerGrpcAddress + option.FilerMountRootPath + util.Version()))[0:8] cacheDir := path.Join(option.CacheDir, cacheUniqueId) if option.CacheSizeMB > 0 { os.MkdirAll(cacheDir, os.FileMode(0777)&^option.Umask) |