Merge pull request #2 from chrislusf/master

merge master of chris

weed/server/raft_server.go

@@ -44,6 +44,7 @@ func NewRaftServer(r *mux.Router, peers []string, httpAddr string, dataDir strin
 	var err error
 	transporter := raft.NewHTTPTransporter("/cluster", time.Second)
 	transporter.Transport.MaxIdleConnsPerHost = 1024
+	transporter.Transport.IdleConnTimeout = time.Second
 	glog.V(0).Infof("Starting RaftServer with %v", httpAddr)
 
 	// Clear old cluster configurations if peers are changed

weed/wdclient/masterclient.go

@@ -63,6 +63,11 @@ func (mc *MasterClient) tryAllMasters() {
 				return err
 			}
 
+			if mc.currentMaster == "" {
+				glog.V(0).Infof("Connected to %v", master)
+				mc.currentMaster = master
+			}
+
 			for {
 				if volumeLocation, err := stream.Recv(); err != nil {
 					glog.V(0).Infof("failed to receive from %s: %v", master, err)
@@ -78,12 +83,6 @@ func (mc *MasterClient) tryAllMasters() {
 					for _, deletedVid := range volumeLocation.DeletedVids {
 						mc.deleteLocation(deletedVid, loc)
 					}
-
-					if mc.currentMaster == "" {
-						glog.V(0).Infof("Connected to %v", master)
-						mc.currentMaster = master
-					}
-
 				}
 			}