gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

add feature to mount a specific filer path to local directory

Browse source
This commit is contained in:
Chris Lu 2018-07-14 21:09:21 -07:00
parent 3edfe1d28f
commit 7abfab8e77
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
weed/command/mount.go
View file

@ -1,14 +1,15 @@
package command package command
type MountOptions struct { type MountOptions struct {
filer *string filer *string
filerGrpcPort *int filerGrpcPort *int
dir *string filerMountRootPath *string
collection *string dir *string
replication *string collection *string
ttlSec *int replication *string
chunkSizeLimitMB *int ttlSec *int
dataCenter *string chunkSizeLimitMB *int
dataCenter *string
} }
var ( var (
@ -19,6 +20,7 @@ func init() {
cmdMount.Run = runMount // break init cycle cmdMount.Run = runMount // break init cycle
mountOptions.filer = cmdMount.Flag.String("filer", "localhost:8888", "weed filer location") mountOptions.filer = cmdMount.Flag.String("filer", "localhost:8888", "weed filer location")
mountOptions.filerGrpcPort = cmdMount.Flag.Int("filer.grpc.port", 0, "filer grpc server listen port, default to http port + 10000") mountOptions.filerGrpcPort = cmdMount.Flag.Int("filer.grpc.port", 0, "filer grpc server listen port, default to http port + 10000")
mountOptions.filerMountRootPath = cmdMount.Flag.String("filer.path", "/", "mount this remote path from filer server")
mountOptions.dir = cmdMount.Flag.String("dir", ".", "mount weed filer to this directory") mountOptions.dir = cmdMount.Flag.String("dir", ".", "mount weed filer to this directory")
mountOptions.collection = cmdMount.Flag.String("collection", "", "collection to create the files") mountOptions.collection = cmdMount.Flag.String("collection", "", "collection to create the files")
mountOptions.replication = cmdMount.Flag.String("replication", "000", "replication to create to files") mountOptions.replication = cmdMount.Flag.String("replication", "000", "replication to create to files")

2
weed/command/mount_std.go
View file

@ -73,7 +73,7 @@ func runMount(cmd *Command, args []string) bool {
filerAddress := fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort) filerAddress := fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort)
err = fs.Serve(c, filesys.NewSeaweedFileSystem( err = fs.Serve(c, filesys.NewSeaweedFileSystem(
filerAddress, *mountOptions.collection, *mountOptions.replication, int32(*mountOptions.ttlSec), filerAddress, *mountOptions.filerMountRootPath, *mountOptions.collection, *mountOptions.replication, int32(*mountOptions.ttlSec),
*mountOptions.chunkSizeLimitMB, *mountOptions.dataCenter)) *mountOptions.chunkSizeLimitMB, *mountOptions.dataCenter))
if err != nil { if err != nil {
fuse.Unmount(*mountOptions.dir) fuse.Unmount(*mountOptions.dir)

10
weed/filesys/wfs.go
View file

@ -9,10 +9,12 @@ import (
"bazil.org/fuse" "bazil.org/fuse"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"strings"
) )
type WFS struct { type WFS struct {
filerGrpcAddress string filerGrpcAddress string
filerMountRootPath string
listDirectoryEntriesCache *ccache.Cache listDirectoryEntriesCache *ccache.Cache
collection string collection string
replication string replication string
@ -26,9 +28,13 @@ type WFS struct {
pathToHandleLock sync.Mutex pathToHandleLock sync.Mutex
} }
func NewSeaweedFileSystem(filerGrpcAddress string, collection string, replication string, ttlSec int32, chunkSizeLimitMB int, dataCenter string) *WFS { func NewSeaweedFileSystem(filerGrpcAddress string, filerMountRootPath string, collection string, replication string, ttlSec int32, chunkSizeLimitMB int, dataCenter string) *WFS {
if filerMountRootPath != "/" && strings.HasSuffix(filerMountRootPath, "/") {
filerMountRootPath = filerMountRootPath[0:len(filerMountRootPath)-1]
}
return &WFS{ return &WFS{
filerGrpcAddress: filerGrpcAddress, filerGrpcAddress: filerGrpcAddress,
filerMountRootPath: filerMountRootPath,
listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)), listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)),
collection: collection, collection: collection,
replication: replication, replication: replication,
@ -40,7 +46,7 @@ func NewSeaweedFileSystem(filerGrpcAddress string, collection string, replicatio
} }
func (wfs *WFS) Root() (fs.Node, error) { func (wfs *WFS) Root() (fs.Node, error) {
return &Dir{Path: "/", wfs: wfs}, nil return &Dir{Path: wfs.filerMountRootPath, wfs: wfs}, nil
} }
func (wfs *WFS) withFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { func (wfs *WFS) withFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error {