Browse Source

ignore "-peers" option if cluster is already bootstrapped

pull/2/head
Chris Lu 11 years ago
parent
commit
fb75fe852c
  1. 11
      go/weed/weed_server/raft_server.go

11
go/weed/weed_server/raft_server.go

@ -58,14 +58,13 @@ func NewRaftServer(r *mux.Router, version string, peers []string, httpAddr strin
if !s.raftServer.IsLogEmpty() {
glog.V(0).Infoln("Cannot join with an existing log")
} else {
if err := s.Join(s.peers); err != nil {
return nil
}
glog.V(0).Infoln("Joined cluster")
}
if err := s.Join(s.peers); err != nil {
return nil
}
glog.V(0).Infoln("Joined cluster")
// Initialize the server by joining itself.
} else if s.raftServer.IsLogEmpty() {
glog.V(0).Infoln("Initializing new cluster")

Loading…
Cancel
Save