mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
mount: fix k8s pvc and os mount directory permission bug
This commit is contained in:
parent
59e91e9c7e
commit
cbca14edc5
|
@ -7,7 +7,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/chrislusf/seaweedfs/weed/filesys/meta_cache"
|
"github.com/chrislusf/seaweedfs/weed/filesys/meta_cache"
|
||||||
"os"
|
"os"
|
||||||
"os/user"
|
|
||||||
"path"
|
"path"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -87,35 +86,11 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
|
||||||
|
|
||||||
fuse.Unmount(dir)
|
fuse.Unmount(dir)
|
||||||
|
|
||||||
uid, gid := uint32(0), uint32(0)
|
|
||||||
|
|
||||||
// detect mount folder mode
|
// detect mount folder mode
|
||||||
if *option.dirAutoCreate {
|
if *option.dirAutoCreate {
|
||||||
os.MkdirAll(dir, os.FileMode(0777)&^umask)
|
os.MkdirAll(dir, os.FileMode(0777)&^umask)
|
||||||
os.Chmod(dir, os.FileMode(0777)&^umask)
|
|
||||||
}
|
}
|
||||||
mountMode := os.ModeDir | 0777
|
|
||||||
fileInfo, err := os.Stat(dir)
|
fileInfo, err := os.Stat(dir)
|
||||||
if err == nil {
|
|
||||||
mountMode = os.ModeDir | fileInfo.Mode()
|
|
||||||
uid, gid = util.GetFileUidGid(fileInfo)
|
|
||||||
fmt.Printf("mount point owner uid=%d gid=%d mode=%s\n", uid, gid, fileInfo.Mode())
|
|
||||||
} else {
|
|
||||||
fmt.Printf("can not stat %s\n", dir)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if uid == 0 {
|
|
||||||
if u, err := user.Current(); err == nil {
|
|
||||||
if parsedId, pe := strconv.ParseUint(u.Uid, 10, 32); pe == nil {
|
|
||||||
uid = uint32(parsedId)
|
|
||||||
}
|
|
||||||
if parsedId, pe := strconv.ParseUint(u.Gid, 10, 32); pe == nil {
|
|
||||||
gid = uint32(parsedId)
|
|
||||||
}
|
|
||||||
fmt.Printf("current uid=%d gid=%d\n", uid, gid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// mapping uid, gid
|
// mapping uid, gid
|
||||||
uidGidMapper, err := meta_cache.NewUidGidMapper(*option.uidMap, *option.gidMap)
|
uidGidMapper, err := meta_cache.NewUidGidMapper(*option.uidMap, *option.gidMap)
|
||||||
|
@ -175,9 +150,6 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
|
||||||
CacheSizeMB: *option.cacheSizeMB,
|
CacheSizeMB: *option.cacheSizeMB,
|
||||||
DataCenter: *option.dataCenter,
|
DataCenter: *option.dataCenter,
|
||||||
EntryCacheTtl: 3 * time.Second,
|
EntryCacheTtl: 3 * time.Second,
|
||||||
MountUid: uid,
|
|
||||||
MountGid: gid,
|
|
||||||
MountMode: mountMode,
|
|
||||||
MountCtime: fileInfo.ModTime(),
|
MountCtime: fileInfo.ModTime(),
|
||||||
MountMtime: time.Now(),
|
MountMtime: time.Now(),
|
||||||
Umask: umask,
|
Umask: umask,
|
||||||
|
|
|
@ -82,9 +82,9 @@ func (dir *Dir) Getxattr(ctx context.Context, req *fuse.GetxattrRequest, resp *f
|
||||||
func (dir *Dir) setRootDirAttributes(attr *fuse.Attr) {
|
func (dir *Dir) setRootDirAttributes(attr *fuse.Attr) {
|
||||||
attr.Inode = 1 // filer2.FullPath(dir.Path).AsInode()
|
attr.Inode = 1 // filer2.FullPath(dir.Path).AsInode()
|
||||||
attr.Valid = time.Hour
|
attr.Valid = time.Hour
|
||||||
attr.Uid = dir.wfs.option.MountUid
|
attr.Uid = dir.entry.Attributes.Uid
|
||||||
attr.Gid = dir.wfs.option.MountGid
|
attr.Gid = dir.entry.Attributes.Gid
|
||||||
attr.Mode = dir.wfs.option.MountMode
|
attr.Mode = os.FileMode(dir.entry.Attributes.FileMode)
|
||||||
attr.Crtime = dir.wfs.option.MountCtime
|
attr.Crtime = dir.wfs.option.MountCtime
|
||||||
attr.Ctime = dir.wfs.option.MountCtime
|
attr.Ctime = dir.wfs.option.MountCtime
|
||||||
attr.Mtime = dir.wfs.option.MountMtime
|
attr.Mtime = dir.wfs.option.MountMtime
|
||||||
|
|
|
@ -37,9 +37,6 @@ type Option struct {
|
||||||
EntryCacheTtl time.Duration
|
EntryCacheTtl time.Duration
|
||||||
Umask os.FileMode
|
Umask os.FileMode
|
||||||
|
|
||||||
MountUid uint32
|
|
||||||
MountGid uint32
|
|
||||||
MountMode os.FileMode
|
|
||||||
MountCtime time.Time
|
MountCtime time.Time
|
||||||
MountMtime time.Time
|
MountMtime time.Time
|
||||||
|
|
||||||
|
@ -99,7 +96,8 @@ func NewSeaweedFileSystem(option *Option) *WFS {
|
||||||
wfs.metaCache.Shutdown()
|
wfs.metaCache.Shutdown()
|
||||||
})
|
})
|
||||||
|
|
||||||
wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs}
|
entry, _ := filer_pb.GetEntry(wfs, util.FullPath(wfs.option.FilerMountRootPath))
|
||||||
|
wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: entry}
|
||||||
wfs.fsNodeCache = newFsCache(wfs.root)
|
wfs.fsNodeCache = newFsCache(wfs.root)
|
||||||
|
|
||||||
return wfs
|
return wfs
|
||||||
|
|
Loading…
Reference in a new issue