backport of commit 3c2faf2 (#20040)

Co-authored-by: Alexander Scheel <alex.scheel@hashicorp.com>

vault/rollback.go

@@ -44,6 +44,7 @@ type RollbackManager struct {
 	shutdown     bool
 	shutdownCh   chan struct{}
 	shutdownLock sync.Mutex
+	stopTicker   chan struct{}
 	quitContext  context.Context
 
 	core *Core
@@ -67,6 +68,7 @@ func NewRollbackManager(ctx context.Context, logger log.Logger, backendsFunc fun
 		inflight:    make(map[string]*rollbackState),
 		doneCh:      make(chan struct{}),
 		shutdownCh:  make(chan struct{}),
+		stopTicker:  make(chan struct{}),
 		quitContext: ctx,
 		core:        core,
 	}
@@ -91,6 +93,10 @@ func (m *RollbackManager) Stop() {
 	m.inflightAll.Wait()
 }
 
+func (m *RollbackManager) StopTicker() {
+	close(m.stopTicker)
+}
+
 // run is a long running routine to periodically invoke rollback
 func (m *RollbackManager) run() {
 	m.logger.Info("starting rollback manager")
@@ -105,6 +111,10 @@ func (m *RollbackManager) run() {
 		case <-m.shutdownCh:
 			m.logger.Info("stopping rollback manager")
 			return
+
+		case <-m.stopTicker:
+			m.logger.Info("stopping rollback manager ticker for tests")
+			tick.Stop()
 		}
 	}
 }

vault/testing.go

@@ -999,6 +999,10 @@ func (c *TestClusterCore) stop() error {
 	return nil
 }
 
+func (c *TestClusterCore) StopAutomaticRollbacks() {
+	c.rollback.StopTicker()
+}
+
 func (c *TestClusterCore) GrabRollbackLock() {
 	// Ensure we don't hold this lock while there are in flight rollbacks.
 	c.rollback.inflightAll.Wait()