diff options
| -rw-r--r-- | weed/filesys/wfs.go | 11 | ||||
| -rw-r--r-- | weed/mount/weedfs.go | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 54eb9064b..6c91246c1 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -8,7 +8,6 @@ import ( "math/rand" "os" "path" - "path/filepath" "sync" "time" @@ -58,8 +57,7 @@ type Option struct { Cipher bool // whether encrypt data on volume server UidGidMapper *meta_cache.UidGidMapper - uniqueCacheDir string - uniqueCacheTempPageDir string + uniqueCacheDir string } var _ = fs.FS(&WFS{}) @@ -127,6 +125,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { }) grace.OnInterrupt(func() { wfs.metaCache.Shutdown() + os.RemoveAll(option.getUniqueCacheDir()) }) wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, id: 1} @@ -303,13 +302,9 @@ func (wfs *WFS) getCurrentFiler() pb.ServerAddress { func (option *Option) setupUniqueCacheDirectory() { cacheUniqueId := util.Md5String([]byte(option.MountDirectory + string(option.FilerAddresses[0]) + option.FilerMountRootPath + util.Version()))[0:8] option.uniqueCacheDir = path.Join(option.CacheDir, cacheUniqueId) - option.uniqueCacheTempPageDir = filepath.Join(option.uniqueCacheDir, "sw") - os.MkdirAll(option.uniqueCacheTempPageDir, os.FileMode(0777)&^option.Umask) + os.MkdirAll(option.uniqueCacheDir, os.FileMode(0777)&^option.Umask) } -func (option *Option) getTempFilePageDir() string { - return option.uniqueCacheTempPageDir -} func (option *Option) getUniqueCacheDir() string { return option.uniqueCacheDir } diff --git a/weed/mount/weedfs.go b/weed/mount/weedfs.go index 25ef830ae..47cb5ad98 100644 --- a/weed/mount/weedfs.go +++ b/weed/mount/weedfs.go @@ -16,7 +16,6 @@ import ( "math/rand" "os" "path" - "path/filepath" "time" "github.com/hanwen/go-fuse/v2/fs" @@ -50,8 +49,7 @@ type Option struct { Cipher bool // whether encrypt data on volume server UidGidMapper *meta_cache.UidGidMapper - uniqueCacheDir string - uniqueCacheTempPageDir string + uniqueCacheDir string } type WFS struct { @@ -101,6 +99,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { }) grace.OnInterrupt(func() { wfs.metaCache.Shutdown() + os.RemoveAll(option.getUniqueCacheDir()) }) if wfs.option.ConcurrentWriters > 0 { @@ -177,13 +176,9 @@ func (wfs *WFS) getCurrentFiler() pb.ServerAddress { func (option *Option) setupUniqueCacheDirectory() { cacheUniqueId := util.Md5String([]byte(option.MountDirectory + string(option.FilerAddresses[0]) + option.FilerMountRootPath + util.Version()))[0:8] option.uniqueCacheDir = path.Join(option.CacheDir, cacheUniqueId) - option.uniqueCacheTempPageDir = filepath.Join(option.uniqueCacheDir, "sw") - os.MkdirAll(option.uniqueCacheTempPageDir, os.FileMode(0777)&^option.Umask) + os.MkdirAll(option.uniqueCacheDir, os.FileMode(0777)&^option.Umask) } -func (option *Option) getTempFilePageDir() string { - return option.uniqueCacheTempPageDir -} func (option *Option) getUniqueCacheDir() string { return option.uniqueCacheDir } |