diff options
| -rw-r--r-- | weed/command/mount_std.go | 33 | ||||
| -rw-r--r-- | weed/filesys/meta_cache/meta_cache_init.go | 1 |
2 files changed, 19 insertions, 15 deletions
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 550921188..3d2f267bc 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -141,26 +141,13 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { options = append(options, fuse.AllowNonEmptyMount()) } - // mount - c, err := fuse.Mount(dir, options...) - if err != nil { - glog.V(0).Infof("mount: %v", err) - return true - } - defer fuse.Unmount(dir) - - grace.OnInterrupt(func() { - fuse.Unmount(dir) - c.Close() - }) - // find mount point mountRoot := filerMountRootPath if mountRoot != "/" && strings.HasSuffix(mountRoot, "/") { mountRoot = mountRoot[0 : len(mountRoot)-1] } - err = fs.Serve(c, filesys.NewSeaweedFileSystem(&filesys.Option{ + seaweedFileSystem := filesys.NewSeaweedFileSystem(&filesys.Option{ FilerGrpcAddress: filerGrpcAddress, GrpcDialOption: grpcDialOption, FilerMountRootPath: mountRoot, @@ -182,7 +169,23 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { OutsideContainerClusterMode: *mountOptions.outsideContainerClusterMode, AsyncMetaDataCaching: *mountOptions.asyncMetaDataCaching, Cipher: cipher, - })) + }) + + // mount + c, err := fuse.Mount(dir, options...) + if err != nil { + glog.V(0).Infof("mount: %v", err) + return true + } + defer fuse.Unmount(dir) + + grace.OnInterrupt(func() { + fuse.Unmount(dir) + c.Close() + }) + + glog.V(0).Infof("mounted %s%s to %s", filer, mountRoot, dir) + err = fs.Serve(c, seaweedFileSystem) // check if the mount process has an error to report <-c.Ready diff --git a/weed/filesys/meta_cache/meta_cache_init.go b/weed/filesys/meta_cache/meta_cache_init.go index a9d0fa876..58bf6862e 100644 --- a/weed/filesys/meta_cache/meta_cache_init.go +++ b/weed/filesys/meta_cache/meta_cache_init.go @@ -10,6 +10,7 @@ import ( ) func InitMetaCache(mc *MetaCache, client filer_pb.FilerClient, path string) error { + glog.V(0).Infof("synchronizing meta data ...") filer_pb.TraverseBfs(client, util.FullPath(path), func(parentPath util.FullPath, pbEntry *filer_pb.Entry) { entry := filer2.FromPbEntry(string(parentPath), pbEntry) if err := mc.InsertEntry(context.Background(), entry); err != nil { |