Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Failure lockout when starting up Agent using two different bind addresses #52

Closed
wants to merge 1 commit into from
Closed

Failure lockout when starting up Agent using two different bind addresses #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions consul/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,42 @@ func (s *Server) setupRaft() error {
// Setup the peer store
s.raftPeers = raft.NewJSONPeers(path, trans)

// Ensure local host is always included if we are in bootstrap mode
if s.config.Bootstrap {
peers, err := s.raftPeers.Peers()
peers, err := s.raftPeers.Peers()
if err != nil {
store.Close()
return err
}

// Remove all local addresses from peer store to prevent loopback
interfaces, err := net.Interfaces()
if err != nil {
return err
}

for _, inter := range interfaces {
addrs, err := inter.Addrs()
if err != nil {
store.Close()
return err
}
if !raft.PeerContained(peers, trans.LocalAddr()) {
s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr()))

for _, addr := range addrs {
ip := addr.(*net.IPNet).IP
addr = &net.TCPAddr{
IP: ip,
Port: trans.LocalAddr().(*net.TCPAddr).Port,
}

if raft.PeerContained(peers, addr) {
s.raftPeers.SetPeers(raft.ExcludePeer(peers, addr))
}
}
}

// Ensure local host is always included if we are in bootstrap mode
if s.config.Bootstrap {
s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr()))
}

// Make sure we set the LogOutput
s.config.RaftConfig.LogOutput = s.config.LogOutput

Expand Down