1. volume server now sends master server its max file key, so that

master server does not need to store the sequence on disk any more
2. fix raft server's failure to init cluster during bootstrapping

7 files changed, 19 insertions, 23 deletions

diff --git a/go/weed/master.go b/go/weed/master.go
index 1efa0e79c..c494ff42b 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -72,11 +72,12 @@ func runMaster(cmd *Command, args []string) bool {
 
 	go func() {
 		time.Sleep(100 * time.Millisecond)
+		myAddress := *masterIp + ":" + strconv.Itoa(*mport)
 		var peers []string
 		if *masterPeers != "" {
 			peers = strings.Split(*masterPeers, ",")
 		}
-		raftServer := weed_server.NewRaftServer(r, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder, ms.Topo, *mpulse)
+		raftServer := weed_server.NewRaftServer(r, peers, myAddress, *metaFolder, ms.Topo, *mpulse)
 		ms.SetRaftServer(raftServer)
 	}()
 
diff --git a/go/weed/server.go b/go/weed/server.go
index 87b541fd3..61e42fb36 100644
--- a/go/weed/server.go
+++ b/go/weed/server.go
@@ -164,11 +164,12 @@ func runServer(cmd *Command, args []string) bool {
 		go func() {
 			raftWaitForMaster.Wait()
 			time.Sleep(100 * time.Millisecond)
+			myAddress := *serverIp + ":" + strconv.Itoa(*masterPort)
 			var peers []string
 			if *serverPeers != "" {
 				peers = strings.Split(*serverPeers, ",")
 			}
-			raftServer := weed_server.NewRaftServer(r, peers, *serverIp+":"+strconv.Itoa(*masterPort), *masterMetaFolder, ms.Topo, *volumePulse)
+			raftServer := weed_server.NewRaftServer(r, peers, myAddress, *masterMetaFolder, ms.Topo, *volumePulse)
 			ms.SetRaftServer(raftServer)
 			volumeWait.Done()
 		}()
diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go
index b932e1b11..874688cbb 100644
--- a/go/weed/weed_server/master_server.go
+++ b/go/weed/weed_server/master_server.go
@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
-	"path"
 	"sync"
 )
 
@@ -48,7 +47,7 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string,
 		whiteList:               whiteList,
 	}
 	ms.bounedLeaderChan = make(chan int, 16)
-	seq := sequence.NewFileSequencer(path.Join(metaFolder, "weed.seq"))
+	seq := sequence.NewMemorySequencer()
 	var e error
 	if ms.Topo, e = topology.NewTopology("topo", confFile, seq,
 		uint64(volumeSizeLimitMB)*1024*1024, pulseSeconds); e != nil {
@@ -97,7 +96,7 @@ func (ms *MasterServer) proxyToLeader(f func(w http.ResponseWriter, r *http.Requ
 	return func(w http.ResponseWriter, r *http.Request) {
 		if ms.Topo.IsLeader() {
 			f(w, r)
-		} else if ms.Topo.RaftServer.Leader() != "" {
+		} else if ms.Topo.RaftServer != nil && ms.Topo.RaftServer.Leader() != "" {
 			ms.bounedLeaderChan <- 1
 			defer func() { <-ms.bounedLeaderChan }()
 			targetUrl, err := url.Parse("http://" + ms.Topo.RaftServer.Leader())
@@ -111,7 +110,7 @@ func (ms *MasterServer) proxyToLeader(f func(w http.ResponseWriter, r *http.Requ
 			proxy.ServeHTTP(w, r)
 		} else {
 			//drop it to the floor
-			writeJsonError(w, r, errors.New(ms.Topo.RaftServer.Name()+"does not know Leader yet:"+ms.Topo.RaftServer.Leader()))
+			writeJsonError(w, r, errors.New(ms.Topo.RaftServer.Name()+" does not know Leader yet:"+ms.Topo.RaftServer.Leader()))
 		}
 	}
 }
diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go
index d34baa349..e549a1dfb 100644
--- a/go/weed/weed_server/master_server_handlers_admin.go
+++ b/go/weed/weed_server/master_server_handlers_admin.go
@@ -36,6 +36,7 @@ func (ms *MasterServer) dirJoinHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	port, _ := strconv.Atoi(r.FormValue("port"))
 	maxVolumeCount, _ := strconv.Atoi(r.FormValue("maxVolumeCount"))
+	maxFileKey, _ := strconv.ParseUint(r.FormValue("maxFileKey"), 10, 64)
 	s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port")
 	publicUrl := r.FormValue("publicUrl")
 	volumes := new([]storage.VolumeInfo)
@@ -44,7 +45,7 @@ func (ms *MasterServer) dirJoinHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	debug(s, "volumes", r.FormValue("volumes"))
-	ms.Topo.RegisterVolumes(init, *volumes, ip, port, publicUrl, maxVolumeCount, r.FormValue("dataCenter"), r.FormValue("rack"))
+	ms.Topo.RegisterVolumes(init, *volumes, ip, port, publicUrl, maxVolumeCount, maxFileKey, r.FormValue("dataCenter"), r.FormValue("rack"))
 	writeJsonQuiet(w, r, operation.JoinResult{VolumeSizeLimit: uint64(ms.volumeSizeLimitMB) * 1024 * 1024})
 }
 
diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go
index b5a9dd9b6..f67caaebd 100644
--- a/go/weed/weed_server/raft_server.go
+++ b/go/weed/weed_server/raft_server.go
@@ -77,13 +77,6 @@ func NewRaftServer(r *mux.Router, peers []string, httpAddr string, dataDir strin
 					return nil
 				}
 			}
-			var err error
-			for err != nil {
-				glog.V(0).Infoln("waiting for peers on", strings.Join(s.peers, ","), "...")
-				time.Sleep(time.Duration(1000+rand.Intn(2000)) * time.Millisecond)
-				err = s.Join(s.peers)
-			}
-			glog.V(0).Infoln("Joined cluster")
 		}
 
 		// Initialize the server by joining itself.
@@ -124,14 +117,17 @@ func (s *RaftServer) Join(peers []string) error {
 		ConnectionString: "http://" + s.httpAddr,
 	}
 
+	var err error
 	var b bytes.Buffer
 	json.NewEncoder(&b).Encode(command)
-
 	for _, m := range peers {
+		if m == s.httpAddr {
+			continue
+		}
 		target := fmt.Sprintf("http://%s/cluster/join", strings.TrimSpace(m))
 		glog.V(0).Infoln("Attempting to connect to:", target)
 
-		err := postFollowingOneRedirect(target, "application/json", &b)
+		err = postFollowingOneRedirect(target, "application/json", &b)
 
 		if err != nil {
 			glog.V(0).Infoln("Post returned error: ", err.Error())
@@ -139,11 +135,9 @@ func (s *RaftServer) Join(peers []string) error {
 				// If we receive a network error try the next member
 				continue
 			}
-
-			return err
+		} else {
+			return nil
 		}
-
-		return nil
 	}
 
 	return errors.New("Could not connect to any cluster peers")
diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go
index 6a3c58b29..1ce24a963 100644
--- a/go/weed/weed_server/raft_server_handlers.go
+++ b/go/weed/weed_server/raft_server_handlers.go
@@ -18,7 +18,7 @@ func (s *RaftServer) joinHandler(w http.ResponseWriter, req *http.Request) {
 	commandText, _ := ioutil.ReadAll(req.Body)
 	glog.V(0).Info("Command:", string(commandText))
 	if err := json.NewDecoder(strings.NewReader(string(commandText))).Decode(&command); err != nil {
-		glog.V(0).Infoln("Error decoding json message:", err)
+		glog.V(0).Infoln("Error decoding json message:", err, string(commandText))
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go
index 377e1e99c..a2db0d8a9 100644
--- a/go/weed/weed_server/volume_server.go
+++ b/go/weed/weed_server/volume_server.go
@@ -54,10 +54,10 @@ func NewVolumeServer(r *http.ServeMux, ip string, port int, publicUrl string, fo
 			if err == nil {
 				if !connected {
 					connected = true
-					glog.V(0).Infoln("Reconnected with master")
+					glog.V(0).Infoln("Volume Server Connected with master")
 				}
 			} else {
-				glog.V(4).Infoln("Failing to talk with master:", err.Error())
+				glog.V(4).Infoln("Volume Server Failed to talk with master:", err.Error())
 				if connected {
 					connected = false
 				}