From 29a0af7f795c270aa967fdae5e2b0678acc81dca Mon Sep 17 00:00:00 2001
From: Chris Capurso <1036769+ccapurso@users.noreply.github.com>
Date: Mon, 25 Apr 2022 21:09:41 +0000
Subject: [PATCH] backport of commit 8c5cf17931b3d842fb72bf827a58f9491b59251b

---
 vault/raft.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vault/raft.go b/vault/raft.go
index 7fd0a30e81e0b..427af3bd21825 100644
--- a/vault/raft.go
+++ b/vault/raft.go
@@ -500,7 +500,6 @@ func (c *Core) raftTLSRotatePhased(ctx context.Context, logger hclog.Logger, raf
 		ticker := time.NewTicker(time.Until(nextRotationTime))
 		defer ticker.Stop()
 		for {
-			ticker.Reset(time.Until(nextRotationTime))
 			select {
 			case <-keyCheckInterval.C:
 				err := checkCommitted()
@@ -517,6 +516,8 @@ func (c *Core) raftTLSRotatePhased(ctx context.Context, logger hclog.Logger, raf
 					nextRotationTime = getNextRotationTime(next)
 				}
 
+				ticker.Reset(time.Until(nextRotationTime))
+
 			case <-stopCh:
 				return
 			}