status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Copies the autopilot settings from the runtime config. 

Fixes #3730
This commit is contained in:
James Phillips 2017-12-13 10:31:45 -08:00
parent 6be97eb8bb
commit 2892f91d0b
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
agent/agent.go
View File

@ -767,30 +767,19 @@ func (a *Agent) consulConfig() (*consul.Config, error) {
if a.config.SessionTTLMin != 0 {
base.SessionTTLMin = a.config.SessionTTLMin
}
if a.config.AutopilotCleanupDeadServers {
base.AutopilotConfig.CleanupDeadServers = a.config.AutopilotCleanupDeadServers
}
if a.config.AutopilotLastContactThreshold != 0 {
base.AutopilotConfig.LastContactThreshold = a.config.AutopilotLastContactThreshold
}
if a.config.AutopilotMaxTrailingLogs != 0 {
base.AutopilotConfig.MaxTrailingLogs = uint64(a.config.AutopilotMaxTrailingLogs)
}
if a.config.AutopilotServerStabilizationTime != 0 {
base.AutopilotConfig.ServerStabilizationTime = a.config.AutopilotServerStabilizationTime
}
if a.config.NonVotingServer {
base.NonVoter = a.config.NonVotingServer
}
if a.config.AutopilotRedundancyZoneTag != "" {
base.AutopilotConfig.RedundancyZoneTag = a.config.AutopilotRedundancyZoneTag
}
if a.config.AutopilotDisableUpgradeMigration {
base.AutopilotConfig.DisableUpgradeMigration = a.config.AutopilotDisableUpgradeMigration
}
if a.config.AutopilotUpgradeVersionTag != "" {
base.AutopilotConfig.UpgradeVersionTag = a.config.AutopilotUpgradeVersionTag
}
// These are fully specified in the agent defaults, so we can simply
// copy them over.
base.AutopilotConfig.CleanupDeadServers = a.config.AutopilotCleanupDeadServers
base.AutopilotConfig.LastContactThreshold = a.config.AutopilotLastContactThreshold
base.AutopilotConfig.MaxTrailingLogs = uint64(a.config.AutopilotMaxTrailingLogs)
base.AutopilotConfig.ServerStabilizationTime = a.config.AutopilotServerStabilizationTime
base.AutopilotConfig.RedundancyZoneTag = a.config.AutopilotRedundancyZoneTag
base.AutopilotConfig.DisableUpgradeMigration = a.config.AutopilotDisableUpgradeMigration
base.AutopilotConfig.UpgradeVersionTag = a.config.AutopilotUpgradeVersionTag
// make sure the advertise address is always set
if base.RPCAdvertise == nil {

6
agent/config/default.go
View File

@ -54,6 +54,12 @@ func DefaultSource() Source {
syslog_facility = "LOCAL0"
tls_min_version = "tls10"
autopilot = {
cleanup_dead_servers = true
last_contact_threshold = "200ms"
max_trailing_logs = 250
server_stabilization_time = "10s"
}
dns_config = {
allow_stale = true
udp_answer_limit = 3