volume servers always connect to the master leader

2 files changed, 2 insertions, 12 deletions

diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index 4a0b2103b..0601effed 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -117,17 +117,6 @@ func NewFilerServer(r *http.ServeMux, ip string, port int, master string, dir st
 		fs.masterNodes = storage.NewMasterNodes(fs.master)
 		glog.V(0).Infof("Filer server bootstraps with master %s", fs.getMasterNode())
 
-		//force initialize with all available master nodes
-		for {
-			_, err := fs.masterNodes.FindMaster()
-			if err != nil {
-				glog.Infof("filer server failed to get master cluster info:%s", err.Error())
-				time.Sleep(3 * time.Second)
-			} else {
-				break
-			}
-		}
-
 		for {
 			glog.V(4).Infof("Filer server sending to master %s", fs.getMasterNode())
 			master, err := fs.detectHealthyMaster(fs.getMasterNode())
diff --git a/weed/server/volume_grpc_client.go b/weed/server/volume_grpc_client.go
index ac3871c8c..d2d6f1a91 100644
--- a/weed/server/volume_grpc_client.go
+++ b/weed/server/volume_grpc_client.go
@@ -23,13 +23,14 @@ func (vs *VolumeServer) heartbeat() {
 		err := vs.doHeartbeat(time.Duration(vs.pulseSeconds) * time.Second)
 		if err != nil {
 			glog.V(0).Infof("heartbeat error: %v", err)
-			time.Sleep(time.Duration(3*vs.pulseSeconds) * time.Second)
+			time.Sleep(time.Duration(vs.pulseSeconds) * time.Second)
 		}
 	}
 }
 
 func (vs *VolumeServer) doHeartbeat(sleepInterval time.Duration) error {
 
+	vs.masterNodes.Reset()
 	masterNode, err := vs.masterNodes.FindMaster()
 	if err != nil {
 		return fmt.Errorf("No master found: %v", err)