Browse Source

a little refactoring

pull/313/head
Chris Lu 9 years ago
parent
commit
0e3140c54c
  1. 17
      weed/server/filer_server.go

17
weed/server/filer_server.go

@ -120,20 +120,14 @@ func (fs *FilerServer) setMasterNode(masterNode string) {
} }
func (fs *FilerServer) detectHealthyMaster(masterNode string) (master string, e error) { func (fs *FilerServer) detectHealthyMaster(masterNode string) (master string, e error) {
statUrl := "http://" + masterNode + "/stats"
glog.V(4).Infof("Connecting to %s ...", statUrl)
_, e = util.Get(statUrl)
if e != nil {
if e = checkMaster(masterNode); e != nil {
fs.masterNodes.Reset() fs.masterNodes.Reset()
for i := 0; i <= 3; i++ { for i := 0; i <= 3; i++ {
master, e = fs.masterNodes.FindMaster() master, e = fs.masterNodes.FindMaster()
if e != nil { if e != nil {
continue continue
} else { } else {
statUrl := "http://" + master + "/stats"
glog.V(4).Infof("Connecting to %s ...", statUrl)
_, e = util.Get(statUrl)
if e == nil {
if e = checkMaster(masterNode); e == nil {
break break
} }
} }
@ -143,3 +137,10 @@ func (fs *FilerServer) detectHealthyMaster(masterNode string) (master string, e
} }
return return
} }
func checkMaster(masterNode string) error {
statUrl := "http://" + masterNode + "/stats"
glog.V(4).Infof("Connecting to %s ...", statUrl)
_, e := util.Get(statUrl)
return e
}
Loading…
Cancel
Save