github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A few last autopilot adjustments

pull/3737/head
Kyle Havlovitz 2017-12-13 11:10:42 -08:00
parent 2310687c1d
commit d6b266c045
No known key found for this signature in database
GPG Key ID: 8A5E6B173056AD6C
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/consul/autopilot/autopilot.go
View File

@ -88,7 +88,7 @@ func (a *Autopilot) run() {
return return
case <-ticker.C: case <-ticker.C:
if err := a.promoteServers(); err != nil { if err := a.promoteServers(); err != nil {
a.logger.Printf("[ERR] autopilot: %v", err) a.logger.Printf("[ERR] autopilot: Error promoting servers: %v", err)
} }
if err := a.pruneDeadServers(); err != nil { if err := a.pruneDeadServers(); err != nil {
@ -145,6 +145,11 @@ func NumPeers(raftConfig raft.Configuration) int {
// pruneDeadServers removes up to numPeers/2 failed servers // pruneDeadServers removes up to numPeers/2 failed servers
func (a *Autopilot) pruneDeadServers() error { func (a *Autopilot) pruneDeadServers() error {
conf := a.delegate.AutopilotConfig()
if conf == nil || !conf.CleanupDeadServers {
return nil
}
// Failed servers are known to Serf and marked failed, and stale servers // Failed servers are known to Serf and marked failed, and stale servers
// are known to Raft but not Serf. // are known to Raft but not Serf.
var failed []string var failed []string