From f40b8f6aba0b0fdf1d81bd0dc9afbc7dba181104 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 2 Nov 2023 09:05:35 -0400 Subject: [PATCH 1/2] Fix rate limiter raft panic. Fixes #1494 --- controller/raft/raft.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controller/raft/raft.go b/controller/raft/raft.go index f1b30c92c..7b12282dd 100644 --- a/controller/raft/raft.go +++ b/controller/raft/raft.go @@ -486,7 +486,9 @@ func (self *Controller) ApplyWithTimeout(log []byte, timeout time.Duration) (int return err } - returnValue.Store(f.Response()) + if response := f.Response(); response != nil { + returnValue.Store(response) + } index.Store(f.Index()) return nil }) From 3dc930e50b9270818632b6c5f95d8a4144d49ada Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 2 Nov 2023 09:45:57 -0400 Subject: [PATCH 2/2] Update example HA config files --- doc/ha/ctrl1.yml | 4 ++-- doc/ha/ctrl2.yml | 4 ++-- doc/ha/ctrl3.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/ha/ctrl1.yml b/doc/ha/ctrl1.yml index 039a7913e..23bec8d45 100644 --- a/doc/ha/ctrl1.yml +++ b/doc/ha/ctrl1.yml @@ -7,9 +7,9 @@ raft: - tls:127.0.0.1:6464 identity: - cert: ./pki/ctrl1/certs/server.cert + cert: ./pki/ctrl1/certs/server.chain.pem key: ./pki/ctrl1/keys/server.key - ca: ./pki/ctrl1/certs/server.chain.pem + ca: ./pki/ctrl1/certs/ctrl1.chain.pem ctrl: listener: tls:127.0.0.1:6262 diff --git a/doc/ha/ctrl2.yml b/doc/ha/ctrl2.yml index 5c6f6aaa2..b5fe79b96 100644 --- a/doc/ha/ctrl2.yml +++ b/doc/ha/ctrl2.yml @@ -5,9 +5,9 @@ raft: dataDir: ./data/ctrl2 identity: - cert: ./pki/ctrl2/certs/server.cert + cert: ./pki/ctrl2/certs/server.chain.pem key: ./pki/ctrl2/keys/server.key - ca: ./pki/ctrl2/certs/server.chain.pem + ca: ./pki/ctrl2/certs/ctrl2.chain.pem ctrl: listener: tls:127.0.0.1:6363 diff --git a/doc/ha/ctrl3.yml b/doc/ha/ctrl3.yml index 48f65d717..60bed20fb 100644 --- a/doc/ha/ctrl3.yml +++ b/doc/ha/ctrl3.yml @@ -5,9 +5,9 @@ raft: dataDir: ./data/ctrl3 identity: - cert: ./pki/ctrl3/certs/server.cert + cert: ./pki/ctrl3/certs/server.chain.pem key: ./pki/ctrl3/keys/server.key - ca: ./pki/ctrl3/certs/server.chain.pem + ca: ./pki/ctrl3/certs/ctrl3.chain.pem ctrl: listener: tls:127.0.0.1:6464