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

Merge pull request #335 from hxiaodon/master

Browse source 
fix bug when choosing the healthy master in filer service
This commit is contained in:
Chris Lu 2016-06-30 08:03:35 -07:00 committed by GitHub
parent 5771225f54 339856eb78
commit 8dfe22ef1c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
weed/server/filer_server.go
View file

@ -73,7 +73,10 @@ func NewFilerServer(r *http.ServeMux, ip string, port int, master string, dir st
glog.V(0).Infof("Filer server bootstraps with master %s", fs.getMasterNode()) glog.V(0).Infof("Filer server bootstraps with master %s", fs.getMasterNode())
//force initialize with all available master nodes //force initialize with all available master nodes
fs.masterNodes.FindMaster() _, err := fs.masterNodes.FindMaster()
if err != nil {
glog.Fatalf("filer server failed to get master cluster info:%s", err.Error())
}
for { for {
glog.V(4).Infof("Filer server sending to master %s", fs.getMasterNode()) glog.V(4).Infof("Filer server sending to master %s", fs.getMasterNode())
@ -127,7 +130,7 @@ func (fs *FilerServer) detectHealthyMaster(masterNode string) (master string, e
if e != nil { if e != nil {
continue continue
} else { } else {
if e = checkMaster(masterNode); e == nil { if e = checkMaster(master); e == nil {
break break
} }
} }