luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fixes a startup ordering issue between Raft and Serf. 

This fixes #2663 and fixes #1899. It's not super related to this PR,
but the startup time changes that this PR brings made this a lot worse
so I was able to track it down.
This commit is contained in:
James Phillips 2017-01-18 15:06:15 -08:00
parent 55cd1d975c
commit abe7b33986
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
consul/server.go
View File

@ -284,6 +284,10 @@ func NewServer(config *Config) (*Server, error) {
} }
go s.wanEventHandler() go s.wanEventHandler()
// Start monitoring leadership. This must happen after Serf is set up
// since it can fire events when leadership is obtained.
go s.monitorLeadership()
// Start ACL replication. // Start ACL replication.
if s.IsACLReplicationEnabled() { if s.IsACLReplicationEnabled() {
go s.runACLReplication() go s.runACLReplication()
@ -491,9 +495,6 @@ func (s *Server) setupRaft() error {
if err != nil { if err != nil {
return err return err
} }
// Start monitoring leadership.
go s.monitorLeadership()
return nil return nil
} }