aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2016-06-06 23:50:27 -0700
committerChris Lu <chris.lu@gmail.com>2016-06-06 23:50:27 -0700
commit0e3140c54c7f461a6b54ebac6d315542cc5e4ea9 (patch)
treee3aa985a9f4b74a2360fc4af9e4e39655a24310d
parent04380d6a363d71ee08de1c52f693890055b17766 (diff)
downloadseaweedfs-0e3140c54c7f461a6b54ebac6d315542cc5e4ea9.tar.xz
seaweedfs-0e3140c54c7f461a6b54ebac6d315542cc5e4ea9.zip
a little refactoring
-rw-r--r--weed/server/filer_server.go17
1 files changed, 9 insertions, 8 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index 767db3aea..dfdf25333 100644
--- a/weed/server/filer_server.go
+++ b/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) {
- 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()
for i := 0; i <= 3; i++ {
master, e = fs.masterNodes.FindMaster()
if e != nil {
continue
} 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
}
}
@@ -143,3 +137,10 @@ func (fs *FilerServer) detectHealthyMaster(masterNode string) (master string, e
}
return
}
+
+func checkMaster(masterNode string) error {
+ statUrl := "http://" + masterNode + "/stats"
+ glog.V(4).Infof("Connecting to %s ...", statUrl)
+ _, e := util.Get(statUrl)
+ return e
+}