diff --git a/agent/consul/config.go b/agent/consul/config.go index d7e92943b..c55368590 100644 --- a/agent/consul/config.go +++ b/agent/consul/config.go @@ -537,6 +537,10 @@ func DefaultConfig() *Config { conf.SerfLANConfig.MemberlistConfig.BindPort = DefaultLANSerfPort conf.SerfWANConfig.MemberlistConfig.BindPort = DefaultWANSerfPort + // Allow dead nodes to be replaced after 30 seconds. + conf.SerfLANConfig.MemberlistConfig.DeadNodeReclaimTime = 30 * time.Second + conf.SerfWANConfig.MemberlistConfig.DeadNodeReclaimTime = 30 * time.Second + // Raft protocol version 3 only works with other Consul servers running // 0.8.0 or later. conf.RaftConfig.ProtocolVersion = 3 diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go index 9378c34ed..841179ac8 100644 --- a/agent/consul/server_test.go +++ b/agent/consul/server_test.go @@ -69,6 +69,7 @@ func testServerConfig(t *testing.T) (string, *Config) { config.SerfLANConfig.MemberlistConfig.ProbeTimeout = 50 * time.Millisecond config.SerfLANConfig.MemberlistConfig.ProbeInterval = 100 * time.Millisecond config.SerfLANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond + config.SerfLANConfig.MemberlistConfig.DeadNodeReclaimTime = 100 * time.Millisecond config.SerfWANConfig.MemberlistConfig.BindAddr = "127.0.0.1" config.SerfWANConfig.MemberlistConfig.BindPort = ports[2] @@ -77,6 +78,7 @@ func testServerConfig(t *testing.T) (string, *Config) { config.SerfWANConfig.MemberlistConfig.ProbeTimeout = 50 * time.Millisecond config.SerfWANConfig.MemberlistConfig.ProbeInterval = 100 * time.Millisecond config.SerfWANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond + config.SerfWANConfig.MemberlistConfig.DeadNodeReclaimTime = 100 * time.Millisecond config.RaftConfig.LeaderLeaseTimeout = 100 * time.Millisecond config.RaftConfig.HeartbeatTimeout = 200 * time.Millisecond