aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author霍晓栋 <huoxd@jiedaibao.com>2016-06-30 19:54:05 +0800
committer霍晓栋 <huoxd@jiedaibao.com>2016-06-30 19:54:05 +0800
commit339856eb783d4ba6597609d1dbe50bb575fb08df (patch)
treebb5989d73bfe2afd7519bd0e0dba326c66868110
parent5771225f54aac7f09d5123e8e83dd32ac47e0afe (diff)
downloadseaweedfs-339856eb783d4ba6597609d1dbe50bb575fb08df.tar.xz
seaweedfs-339856eb783d4ba6597609d1dbe50bb575fb08df.zip
fix bug when choosing the healthy master in filer service
-rw-r--r--weed/server/filer_server.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index dfdf25333..1b54f0840 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -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())
//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 {
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 {
continue
} else {
- if e = checkMaster(masterNode); e == nil {
+ if e = checkMaster(master); e == nil {
break
}
}