diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/master.go | 13 | ||||
| -rw-r--r-- | weed/command/server.go | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index fb09a24b4..3d33f4f7a 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -100,8 +100,11 @@ func runMaster(cmd *Command, args []string) bool { } func startMaster(masterOption MasterOptions, masterWhiteList []string) { + + myMasterAddress, peers := checkPeers(*masterOption.ip, *masterOption.port, *masterOption.peers) + r := mux.NewRouter() - ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList)) + ms := weed_server.NewMasterServer(r, masterOption.toMasterOption(masterWhiteList), peers) listeningAddress := *masterOption.ipBind + ":" + strconv.Itoa(*masterOption.port) glog.V(0).Infof("Start Seaweed Master %s at %s", util.VERSION, listeningAddress) masterListener, e := util.NewListener(listeningAddress, 0) @@ -109,7 +112,6 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { glog.Fatalf("Master startup error: %v", e) } // start raftServer - myMasterAddress, peers := checkPeers(*masterOption.ip, *masterOption.port, *masterOption.peers) raftServer := weed_server.NewRaftServer(security.LoadClientTLS(viper.Sub("grpc"), "master"), peers, myMasterAddress, *masterOption.metaFolder, ms.Topo, *masterOption.pulseSeconds) if raftServer == nil { @@ -131,6 +133,8 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { glog.V(0).Infof("Start Seaweed Master %s grpc server at %s:%d", util.VERSION, *masterOption.ipBind, grpcPort) go grpcS.Serve(grpcL) + go ms.MasterClient.KeepConnectedToMaster() + // start http server httpS := &http.Server{Handler: r} go httpS.Serve(masterListener) @@ -152,11 +156,10 @@ func checkPeers(masterIp string, masterPort int, peers string) (masterAddress st } } - peerCount := len(cleanedPeers) if !hasSelf { - peerCount += 1 + cleanedPeers = append(cleanedPeers, masterAddress) } - if peerCount%2 == 0 { + if len(cleanedPeers)%2 == 0 { glog.Fatalf("Only odd number of masters are supported!") } return diff --git a/weed/command/server.go b/weed/command/server.go index d39abd9ae..1c6439edc 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -5,7 +5,6 @@ import ( "os" "runtime" "runtime/pprof" - "strconv" "strings" "time" @@ -122,14 +121,13 @@ func runServer(cmd *Command, args []string) bool { *isStartingFiler = true } - master := *serverIp + ":" + strconv.Itoa(*masterOptions.port) masterOptions.ip = serverIp masterOptions.ipBind = serverBindIp - filerOptions.masters = &master + filerOptions.masters = masterOptions.peers filerOptions.ip = serverBindIp serverOptions.v.ip = serverIp serverOptions.v.bindIp = serverBindIp - serverOptions.v.masters = &master + serverOptions.v.masters = masterOptions.peers serverOptions.v.idleConnectionTimeout = serverTimeout serverOptions.v.dataCenter = serverDataCenter serverOptions.v.rack = serverRack |