Merge 8c5cf17 into backport/fix-raft-tls-key-rotation-panic/steadily-…

…expert-louse
hashicorp · Apr 26, 2022 · 019e3f1 · 019e3f1
2 parents 116e337 + 8c5cf17
commit 019e3f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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
 			}