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

Fix looking for master nodes.

Browse source
This commit is contained in:
chrislusf 2015-05-22 08:12:51 -07:00
parent 99aee22e08
commit c7cf4fa46c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
go/storage/store.go
View file

@ -43,7 +43,9 @@ func NewMasterNodes(bootstrapNode string) (mn *MasterNodes) {
return return
} }
func (mn *MasterNodes) reset() { func (mn *MasterNodes) reset() {
glog.V(4).Infof("Resetting master nodes: %v", mn)
if len(mn.nodes) > 1 && mn.lastNode > 0 { if len(mn.nodes) > 1 && mn.lastNode > 0 {
glog.V(0).Infof("Reset master %s from: %v", mn.nodes[mn.lastNode], mn.nodes)
mn.lastNode = -mn.lastNode mn.lastNode = -mn.lastNode
} }
} }
@ -58,9 +60,9 @@ func (mn *MasterNodes) findMaster() (string, error) {
if len(masters) == 0 { if len(masters) == 0 {
continue continue
} }
mn.nodes = masters mn.nodes = append(masters, m)
mn.lastNode = rand.Intn(len(mn.nodes)) mn.lastNode = rand.Intn(len(mn.nodes))
glog.V(2).Info("current master node is :", mn.nodes[mn.lastNode]) glog.V(2).Infof("current master nodes is %v", mn)
break break
} else { } else {
glog.V(4).Infof("Failed listing masters on %s: %v", m, e) glog.V(4).Infof("Failed listing masters on %s: %v", m, e)
@ -321,9 +323,11 @@ func (s *Store) SendHeartbeatToMaster() (masterNode string, secretKey security.S
var ret operation.JoinResult var ret operation.JoinResult
if err := json.Unmarshal(jsonBlob, &ret); err != nil { if err := json.Unmarshal(jsonBlob, &ret); err != nil {
glog.V(0).Infof("Failed to join %s with response: %s", joinUrl, string(jsonBlob)) glog.V(0).Infof("Failed to join %s with response: %s", joinUrl, string(jsonBlob))
s.masterNodes.reset()
return masterNode, "", err return masterNode, "", err
} }
if ret.Error != "" { if ret.Error != "" {
s.masterNodes.reset()
return masterNode, "", errors.New(ret.Error) return masterNode, "", errors.New(ret.Error)
} }
s.volumeSizeLimit = ret.VolumeSizeLimit s.volumeSizeLimit = ret.VolumeSizeLimit