diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-07-16 22:50:14 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-07-16 22:50:14 -0700 |
| commit | f43146b237bc5bbfb7033f6e427b5299554c0824 (patch) | |
| tree | df4a05999d67abb7c4765d39eddc01318521169b /weed/command/master.go | |
| parent | befb396892deb7e5fdaefaf2f952bd744cc08ace (diff) | |
| download | seaweedfs-f43146b237bc5bbfb7033f6e427b5299554c0824.tar.xz seaweedfs-f43146b237bc5bbfb7033f6e427b5299554c0824.zip | |
resolve directories if containing home directory
Diffstat (limited to 'weed/command/master.go')
| -rw-r--r-- | weed/command/master.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 7cbd66f5c..a6fe744d7 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -8,10 +8,11 @@ import ( "strings" "github.com/chrislusf/raft/protobuf" - "github.com/chrislusf/seaweedfs/weed/util/grace" "github.com/gorilla/mux" "google.golang.org/grpc/reflection" + "github.com/chrislusf/seaweedfs/weed/util/grace" + "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" @@ -85,7 +86,7 @@ func runMaster(cmd *Command, args []string) bool { runtime.GOMAXPROCS(runtime.NumCPU()) grace.SetupProfiling(*masterCpuProfile, *masterMemProfile) - if err := util.TestFolderWritable(*m.metaFolder); err != nil { + if err := util.TestFolderWritable(util.ResolvePath(*m.metaFolder)); err != nil { glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *m.metaFolder, err) } @@ -118,7 +119,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { } // start raftServer raftServer := weed_server.NewRaftServer(security.LoadClientTLS(util.GetViper(), "grpc.master"), - peers, myMasterAddress, *masterOption.metaFolder, ms.Topo, 5) + peers, myMasterAddress, util.ResolvePath(*masterOption.metaFolder), ms.Topo, 5) if raftServer == nil { glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717", *masterOption.metaFolder) } |