From 637469e656c09d6e8d682e90ed0497f64e892f29 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 20 Apr 2014 23:28:05 -0700
Subject: [PATCH] log the volume server connected to which master server

---
 go/storage/store.go                  | 16 ++++++++--------
 go/weed/weed_server/volume_server.go |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/go/storage/store.go b/go/storage/store.go
index 8c6663a08..8fe8f2c4c 100644
--- a/go/storage/store.go
+++ b/go/storage/store.go
@@ -264,10 +264,10 @@ func (s *Store) SetRack(rack string) {
 func (s *Store) SetBootstrapMaster(bootstrapMaster string) {
 	s.masterNodes = NewMasterNodes(bootstrapMaster)
 }
-func (s *Store) Join() error {
-	masterNode, e := s.masterNodes.findMaster()
+func (s *Store) Join() (masterNode string, e error) {
+	masterNode, e = s.masterNodes.findMaster()
 	if e != nil {
-		return e
+		return
 	}
 	stats := new([]*VolumeInfo)
 	maxVolumeCount := 0
@@ -305,18 +305,18 @@ func (s *Store) Join() error {
 	jsonBlob, err := util.Post("http://"+masterNode+"/dir/join", values)
 	if err != nil {
 		s.masterNodes.reset()
-		return err
+		return "", err
 	}
 	var ret operation.JoinResult
 	if err := json.Unmarshal(jsonBlob, &ret); err != nil {
-		return err
+		return masterNode, err
 	}
 	if ret.Error != "" {
-		return errors.New(ret.Error)
+		return masterNode, errors.New(ret.Error)
 	}
 	s.volumeSizeLimit = ret.VolumeSizeLimit
 	s.connected = true
-	return nil
+	return
 }
 func (s *Store) Close() {
 	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) {
 				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)
 				}
 			}
diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go
index a2db0d8a9..1db0f9581 100644
--- a/go/weed/weed_server/volume_server.go
+++ b/go/weed/weed_server/volume_server.go
@@ -50,11 +50,11 @@ func NewVolumeServer(r *http.ServeMux, ip string, port int, publicUrl string, fo
 		vs.store.SetDataCenter(vs.dataCenter)
 		vs.store.SetRack(vs.rack)
 		for {
-			err := vs.store.Join()
+			master, err := vs.store.Join()
 			if err == nil {
 				if !connected {
 					connected = true
-					glog.V(0).Infoln("Volume Server Connected with master")
+					glog.V(0).Infoln("Volume Server Connected with master at", master)
 				}
 			} else {
 				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
 }