diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index b4fc74a2ca..c676a80929 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -206,7 +206,6 @@ func TestAgent_CheckPerformanceSettings(t *testing.T) { def := raft.DefaultConfig() if r.HeartbeatTimeout != raftMult*def.HeartbeatTimeout || r.ElectionTimeout != raftMult*def.ElectionTimeout || - r.CommitTimeout != raftMult*def.CommitTimeout || r.LeaderLeaseTimeout != raftMult*def.LeaderLeaseTimeout { t.Fatalf("bad: %#v", *r) } @@ -225,7 +224,6 @@ func TestAgent_CheckPerformanceSettings(t *testing.T) { def := raft.DefaultConfig() if r.HeartbeatTimeout != raftMult*def.HeartbeatTimeout || r.ElectionTimeout != raftMult*def.ElectionTimeout || - r.CommitTimeout != raftMult*def.CommitTimeout || r.LeaderLeaseTimeout != raftMult*def.LeaderLeaseTimeout { t.Fatalf("bad: %#v", *r) } diff --git a/command/agent/config.go b/command/agent/config.go index 92534d7ba9..ae1138ec8c 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -114,8 +114,7 @@ type DNSConfig struct { // Performance is used to tune the performance of Consul's subsystems. type Performance struct { // RaftMultiplier is an integer multiplier used to scale Raft timing - // parameters: HeartbeatTimeout, ElectionTimeout, CommitTimeout, and - // LeaderLeaseTimeout. + // parameters: HeartbeatTimeout, ElectionTimeout, and LeaderLeaseTimeout. RaftMultiplier uint `mapstructure:"raft_multiplier"` } diff --git a/consul/config.go b/consul/config.go index 53f3cf3004..eb7e2947c5 100644 --- a/consul/config.go +++ b/consul/config.go @@ -358,7 +358,6 @@ func (c *Config) ScaleRaft(raftMultRaw uint) { def := raft.DefaultConfig() c.RaftConfig.HeartbeatTimeout = raftMult * def.HeartbeatTimeout c.RaftConfig.ElectionTimeout = raftMult * def.ElectionTimeout - c.RaftConfig.CommitTimeout = raftMult * def.CommitTimeout c.RaftConfig.LeaderLeaseTimeout = raftMult * def.LeaderLeaseTimeout }