diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-03-15 00:36:51 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-03-15 00:36:51 -0700 |
| commit | fb75fe852c5282cef436329bb0700d4d0e09f511 (patch) | |
| tree | f18d118836c3ec3ffb061e12dcc478c3024a0328 /go | |
| parent | 6cedaf43561ea09a266b5fb2d861ae6f6f38c66b (diff) | |
| download | seaweedfs-fb75fe852c5282cef436329bb0700d4d0e09f511.tar.xz seaweedfs-fb75fe852c5282cef436329bb0700d4d0e09f511.zip | |
ignore "-peers" option if cluster is already bootstrapped
Diffstat (limited to 'go')
| -rw-r--r-- | go/weed/weed_server/raft_server.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index 0cc565766..14cd1461b 100644 --- a/go/weed/weed_server/raft_server.go +++ b/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") |