lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-08-25 04:07:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

log the volume server connected to which master server

Browse Source
This commit is contained in:
Chris Lu 2014-04-20 23:28:05 -07:00
parent 5f2604b1f7
commit 637469e656
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
go/storage/store.go
View File

@ -264,10 +264,10 @@ func (s *Store) SetRack(rack string) {
func (s *Store) SetBootstrapMaster(bootstrapMaster string) { func (s *Store) SetBootstrapMaster(bootstrapMaster string) {
s.masterNodes = NewMasterNodes(bootstrapMaster) s.masterNodes = NewMasterNodes(bootstrapMaster)
} }
func (s *Store) Join() error { func (s *Store) Join() (masterNode string, e error) {
masterNode, e := s.masterNodes.findMaster() masterNode, e = s.masterNodes.findMaster()
if e != nil { if e != nil {
return e return
} }
stats := new([]*VolumeInfo) stats := new([]*VolumeInfo)
maxVolumeCount := 0 maxVolumeCount := 0
@ -305,18 +305,18 @@ func (s *Store) Join() error {
jsonBlob, err := util.Post("http://"+masterNode+"/dir/join", values) jsonBlob, err := util.Post("http://"+masterNode+"/dir/join", values)
if err != nil { if err != nil {
s.masterNodes.reset() s.masterNodes.reset()
return err return "", err
} }
var ret operation.JoinResult var ret operation.JoinResult
if err := json.Unmarshal(jsonBlob, &ret); err != nil { if err := json.Unmarshal(jsonBlob, &ret); err != nil {
return err return masterNode, err
} }
if ret.Error != "" { if ret.Error != "" {
return errors.New(ret.Error) return masterNode, errors.New(ret.Error)
} }
s.volumeSizeLimit = ret.VolumeSizeLimit s.volumeSizeLimit = ret.VolumeSizeLimit
s.connected = true s.connected = true
return nil return
} }
func (s *Store) Close() { func (s *Store) Close() {
for _, location := range s.Locations { for _, location := range s.Locations {
@ -338,7 +338,7 @@ func (s *Store) Write(i VolumeId, n *Needle) (size uint32, err error) {
} }
if s.volumeSizeLimit < v.ContentSize()+3*uint64(size) { if s.volumeSizeLimit < v.ContentSize()+3*uint64(size) {
glog.V(0).Infoln("volume", i, "size", v.ContentSize(), "will exceed limit", s.volumeSizeLimit) glog.V(0).Infoln("volume", i, "size", v.ContentSize(), "will exceed limit", s.volumeSizeLimit)
if e := s.Join(); e != nil { if _, e := s.Join(); e != nil {
glog.V(0).Infoln("error when reporting size:", e) glog.V(0).Infoln("error when reporting size:", e)
} }
} }

5
go/weed/weed_server/volume_server.go
View File

@ -50,11 +50,11 @@ func NewVolumeServer(r *http.ServeMux, ip string, port int, publicUrl string, fo
vs.store.SetDataCenter(vs.dataCenter) vs.store.SetDataCenter(vs.dataCenter)
vs.store.SetRack(vs.rack) vs.store.SetRack(vs.rack)
for { for {
err := vs.store.Join() master, err := vs.store.Join()
if err == nil { if err == nil {
if !connected { if !connected {
connected = true connected = true
glog.V(0).Infoln("Volume Server Connected with master") glog.V(0).Infoln("Volume Server Connected with master at", master)
} }
} else { } else {
glog.V(4).Infoln("Volume Server Failed to talk with master:", err.Error()) glog.V(4).Infoln("Volume Server Failed to talk with master:", err.Error())
@ -69,7 +69,6 @@ func NewVolumeServer(r *http.ServeMux, ip string, port int, publicUrl string, fo
} }
} }
}() }()
glog.V(0).Infoln("store joined at", vs.masterNode)
return vs return vs
} }