diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-04-16 23:43:27 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-04-16 23:43:27 -0700 |
| commit | 51939efeac635d0ba8b683cae6176aa60845b5f7 (patch) | |
| tree | 4b630c01d57cc1cc57e2ed58b25a275109039a30 /go/weed/master.go | |
| parent | 9653a54766fbb7d9e7453c0df0eb0de016cfbce6 (diff) | |
| download | seaweedfs-51939efeac635d0ba8b683cae6176aa60845b5f7.tar.xz seaweedfs-51939efeac635d0ba8b683cae6176aa60845b5f7.zip | |
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
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 3 |
1 files changed, 2 insertions, 1 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) }() |