Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(option): add cluster config option

Browse Source 
It will be used when creating a brand-new cluster.
This commit is contained in:
Yicheng Qin
2014-05-09 14:55:16 -07:00
parent 6d4f018887
commit c6b1a738c3
4 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/peer_server.go
View File

@@ -247,7 +247,7 @@ func (s *PeerServer) FindCluster(discoverURL string, peers []string) (toStart bo
// Start starts the raft server.
// The function assumes that join has been accepted successfully.
func (s *PeerServer) Start(snapshot bool) error {
func (s *PeerServer) Start(snapshot bool, clusterConfig *ClusterConfig) error {
s.Lock()
defer s.Unlock()
if s.started {
@@ -260,7 +260,7 @@ func (s *PeerServer) Start(snapshot bool) error {
s.raftServer.Start()
if s.isNewCluster {
s.InitNewCluster()
s.InitNewCluster(clusterConfig)
s.isNewCluster = false
}
@@ -401,7 +401,7 @@ func (s *PeerServer) SetServer(server *Server) {
s.server = server
}
func (s *PeerServer) InitNewCluster() {
func (s *PeerServer) InitNewCluster(clusterConfig *ClusterConfig) {
// leader need to join self as a peer
s.doCommand(&JoinCommand{
MinVersion: store.MinVersion(),
@@ -413,9 +413,8 @@ func (s *PeerServer) InitNewCluster() {
log.Debugf("%s start as a leader", s.Config.Name)
s.joinIndex = 1
conf := NewClusterConfig()
s.doCommand(&SetClusterConfigCommand{Config: conf})
log.Debugf("%s sets cluster config as %v", s.Config.Name, conf)
s.doCommand(&SetClusterConfigCommand{Config: clusterConfig})
log.Debugf("%s sets cluster config as %v", s.Config.Name, clusterConfig)
}
func (s *PeerServer) doCommand(cmd raft.Command) {