From 946ee9b816d4f15dffb492f67d8d2a50c60a8558 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 09:36:19 -0400 Subject: [PATCH 1/8] update raft to v1.3.7 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 15e82d5fe471..37f4a2313814 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 github.com/hashicorp/memberlist v0.3.1 - github.com/hashicorp/raft v1.3.6 + github.com/hashicorp/raft v1.3.7 github.com/hashicorp/raft-autopilot v0.1.6 github.com/hashicorp/raft-boltdb v0.0.0-20211202195631-7d34b9fb3f42 // indirect github.com/hashicorp/raft-boltdb/v2 v2.2.2 diff --git a/go.sum b/go.sum index 1e6194da7787..4976ed66add9 100644 --- a/go.sum +++ b/go.sum @@ -368,8 +368,8 @@ github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft v1.1.1/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= -github.com/hashicorp/raft v1.3.6 h1:v5xW5KzByoerQlN/o31VJrFNiozgzGyDoMgDJgXpsto= -github.com/hashicorp/raft v1.3.6/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= +github.com/hashicorp/raft v1.3.7 h1:mnuQAuSMNRjAvFc9IYxnGxZJ9LBBZyheMR8Kv8Ve71M= +github.com/hashicorp/raft v1.3.7/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I= github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw= github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk= From f8d5fd14df2be9369919557cb54f66f06d584fe2 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 09:39:58 -0400 Subject: [PATCH 2/8] add changelog --- .changelog/12844.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/12844.txt diff --git a/.changelog/12844.txt b/.changelog/12844.txt new file mode 100644 index 000000000000..df944fe77eee --- /dev/null +++ b/.changelog/12844.txt @@ -0,0 +1,3 @@ +```release-note:bug +raft: upgrade to v1.3.6 which fixes a bug where non cluster member can still be able to participate in an election. +``` From 1cc4f783dc32371da165a295803fc37920a379d0 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 09:47:25 -0400 Subject: [PATCH 3/8] fix compilation error --- agent/consul/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/consul/server.go b/agent/consul/server.go index 6147df3bd4b0..37cbe449fa02 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -1620,7 +1620,7 @@ func (s *Server) trackLeaderChanges() { continue } - s.grpcLeaderForwarder.UpdateLeaderAddr(s.config.Datacenter, string(leaderObs.Leader)) + s.grpcLeaderForwarder.UpdateLeaderAddr(s.config.Datacenter, string(leaderObs.LeaderAddr)) case <-s.shutdownCh: s.raft.DeregisterObserver(observer) return From 07b6a1ee10ddc3d60118154576921717c96341eb Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 10:46:14 -0400 Subject: [PATCH 4/8] fix HeartbeatTimeout --- agent/agent.go | 1 + agent/consul/config.go | 1 + agent/consul/server.go | 3 +++ 3 files changed, 5 insertions(+) diff --git a/agent/agent.go b/agent/agent.go index a3f3cfab836c..79d95116ab17 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -3906,6 +3906,7 @@ func (a *Agent) reloadConfigInternal(newCfg *config.RuntimeConfig) error { ConfigEntryBootstrap: newCfg.ConfigEntryBootstrap, RaftSnapshotThreshold: newCfg.RaftSnapshotThreshold, RaftSnapshotInterval: newCfg.RaftSnapshotInterval, + HeartbeatTimeout: newCfg.ConsulRaftHeartbeatTimeout, RaftTrailingLogs: newCfg.RaftTrailingLogs, } if err := a.delegate.ReloadConfig(cc); err != nil { diff --git a/agent/consul/config.go b/agent/consul/config.go index 4b017da6bc5c..12b60cd364fc 100644 --- a/agent/consul/config.go +++ b/agent/consul/config.go @@ -604,6 +604,7 @@ type ReloadableConfig struct { RaftSnapshotThreshold int RaftSnapshotInterval time.Duration RaftTrailingLogs int + HeartbeatTimeout time.Duration } type RaftBoltDBConfig struct { diff --git a/agent/consul/server.go b/agent/consul/server.go index 37cbe449fa02..73a56226690d 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -1583,6 +1583,9 @@ func computeRaftReloadableConfig(config ReloadableConfig) raft.ReloadableConfig if config.RaftTrailingLogs != 0 { raftCfg.TrailingLogs = uint64(config.RaftTrailingLogs) } + if config.HeartbeatTimeout > 5*time.Millisecond { + raftCfg.HeartbeatTimeout = config.HeartbeatTimeout + } return raftCfg } From 0b73d4ec07ff577886d2b04c2a5611a77f481349 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 10:54:04 -0400 Subject: [PATCH 5/8] fix ElectionTimeout to reload only if value is valid --- agent/agent.go | 1 + agent/consul/config.go | 1 + agent/consul/server.go | 3 +++ 3 files changed, 5 insertions(+) diff --git a/agent/agent.go b/agent/agent.go index 79d95116ab17..3978f2737866 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -3907,6 +3907,7 @@ func (a *Agent) reloadConfigInternal(newCfg *config.RuntimeConfig) error { RaftSnapshotThreshold: newCfg.RaftSnapshotThreshold, RaftSnapshotInterval: newCfg.RaftSnapshotInterval, HeartbeatTimeout: newCfg.ConsulRaftHeartbeatTimeout, + ElectionTimeout: newCfg.ConsulRaftElectionTimeout, RaftTrailingLogs: newCfg.RaftTrailingLogs, } if err := a.delegate.ReloadConfig(cc); err != nil { diff --git a/agent/consul/config.go b/agent/consul/config.go index 12b60cd364fc..40d627bedef1 100644 --- a/agent/consul/config.go +++ b/agent/consul/config.go @@ -605,6 +605,7 @@ type ReloadableConfig struct { RaftSnapshotInterval time.Duration RaftTrailingLogs int HeartbeatTimeout time.Duration + ElectionTimeout time.Duration } type RaftBoltDBConfig struct { diff --git a/agent/consul/server.go b/agent/consul/server.go index 73a56226690d..f9518f455999 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -1586,6 +1586,9 @@ func computeRaftReloadableConfig(config ReloadableConfig) raft.ReloadableConfig if config.HeartbeatTimeout > 5*time.Millisecond { raftCfg.HeartbeatTimeout = config.HeartbeatTimeout } + if config.ElectionTimeout > 5*time.Millisecond { + raftCfg.ElectionTimeout = config.ElectionTimeout + } return raftCfg } From e3a16e3e8d9d30a9c8094aa39890ba4ecd629e33 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 12:52:46 -0400 Subject: [PATCH 6/8] fix default values for `ElectionTimeout` and `HeartbeatTimeout` --- agent/consul/server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/consul/server.go b/agent/consul/server.go index f9518f455999..2f64fa67291f 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -1573,6 +1573,8 @@ func computeRaftReloadableConfig(config ReloadableConfig) raft.ReloadableConfig TrailingLogs: defaultConf.RaftConfig.TrailingLogs, SnapshotInterval: defaultConf.RaftConfig.SnapshotInterval, SnapshotThreshold: defaultConf.RaftConfig.SnapshotThreshold, + ElectionTimeout: defaultConf.RaftConfig.ElectionTimeout, + HeartbeatTimeout: defaultConf.RaftConfig.HeartbeatTimeout, } if config.RaftSnapshotThreshold != 0 { raftCfg.SnapshotThreshold = uint64(config.RaftSnapshotThreshold) @@ -1583,10 +1585,10 @@ func computeRaftReloadableConfig(config ReloadableConfig) raft.ReloadableConfig if config.RaftTrailingLogs != 0 { raftCfg.TrailingLogs = uint64(config.RaftTrailingLogs) } - if config.HeartbeatTimeout > 5*time.Millisecond { + if config.HeartbeatTimeout >= 5*time.Millisecond { raftCfg.HeartbeatTimeout = config.HeartbeatTimeout } - if config.ElectionTimeout > 5*time.Millisecond { + if config.ElectionTimeout >= 5*time.Millisecond { raftCfg.ElectionTimeout = config.ElectionTimeout } return raftCfg From 7908f9d4fdea034ed2e6018ac7bf08aad6923dde Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Fri, 22 Apr 2022 13:01:42 -0400 Subject: [PATCH 7/8] fix test defaults --- agent/consul/server_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go index 7b0dafb2b99f..c375ff794569 100644 --- a/agent/consul/server_test.go +++ b/agent/consul/server_test.go @@ -1858,6 +1858,8 @@ func TestServer_computeRaftReloadableConfig(t *testing.T) { SnapshotThreshold: defaults.SnapshotThreshold, SnapshotInterval: defaults.SnapshotInterval, TrailingLogs: defaults.TrailingLogs, + ElectionTimeout: defaults.ElectionTimeout, + HeartbeatTimeout: defaults.HeartbeatTimeout, }, }, { @@ -1869,6 +1871,8 @@ func TestServer_computeRaftReloadableConfig(t *testing.T) { SnapshotThreshold: 123456, SnapshotInterval: defaults.SnapshotInterval, TrailingLogs: defaults.TrailingLogs, + ElectionTimeout: defaults.ElectionTimeout, + HeartbeatTimeout: defaults.HeartbeatTimeout, }, }, { @@ -1880,6 +1884,8 @@ func TestServer_computeRaftReloadableConfig(t *testing.T) { SnapshotThreshold: defaults.SnapshotThreshold, SnapshotInterval: 13 * time.Minute, TrailingLogs: defaults.TrailingLogs, + ElectionTimeout: defaults.ElectionTimeout, + HeartbeatTimeout: defaults.HeartbeatTimeout, }, }, { @@ -1891,6 +1897,8 @@ func TestServer_computeRaftReloadableConfig(t *testing.T) { SnapshotThreshold: defaults.SnapshotThreshold, SnapshotInterval: defaults.SnapshotInterval, TrailingLogs: 78910, + ElectionTimeout: defaults.ElectionTimeout, + HeartbeatTimeout: defaults.HeartbeatTimeout, }, }, { @@ -1899,11 +1907,15 @@ func TestServer_computeRaftReloadableConfig(t *testing.T) { RaftSnapshotThreshold: 123456, RaftSnapshotInterval: 13 * time.Minute, RaftTrailingLogs: 78910, + ElectionTimeout: 300 * time.Millisecond, + HeartbeatTimeout: 400 * time.Millisecond, }, want: raft.ReloadableConfig{ SnapshotThreshold: 123456, SnapshotInterval: 13 * time.Minute, TrailingLogs: 78910, + ElectionTimeout: 300 * time.Millisecond, + HeartbeatTimeout: 400 * time.Millisecond, }, }, } From 7cb3383e547ade191083dc480ed03d4122787070 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Mon, 25 Apr 2022 09:52:13 -0400 Subject: [PATCH 8/8] bump raft to v1.3.8 --- .changelog/12844.txt | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changelog/12844.txt b/.changelog/12844.txt index df944fe77eee..477193881afe 100644 --- a/.changelog/12844.txt +++ b/.changelog/12844.txt @@ -1,3 +1,3 @@ ```release-note:bug -raft: upgrade to v1.3.6 which fixes a bug where non cluster member can still be able to participate in an election. +raft: upgrade to v1.3.8 which fixes a bug where non cluster member can still be able to participate in an election. ``` diff --git a/go.mod b/go.mod index 37f4a2313814..b3fb5807ed56 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 github.com/hashicorp/memberlist v0.3.1 - github.com/hashicorp/raft v1.3.7 + github.com/hashicorp/raft v1.3.8 github.com/hashicorp/raft-autopilot v0.1.6 github.com/hashicorp/raft-boltdb v0.0.0-20211202195631-7d34b9fb3f42 // indirect github.com/hashicorp/raft-boltdb/v2 v2.2.2 diff --git a/go.sum b/go.sum index 4976ed66add9..ca0e61768be5 100644 --- a/go.sum +++ b/go.sum @@ -368,8 +368,8 @@ github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft v1.1.1/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= -github.com/hashicorp/raft v1.3.7 h1:mnuQAuSMNRjAvFc9IYxnGxZJ9LBBZyheMR8Kv8Ve71M= -github.com/hashicorp/raft v1.3.7/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= +github.com/hashicorp/raft v1.3.8 h1:lrhx4wesQLOSv3ERX/pK4cwfzQ0J2RgzsvAkBxHe1bA= +github.com/hashicorp/raft v1.3.8/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I= github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw= github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=