server: sync on SQL setting overrides in testserver tenant init

pkg/server/settingswatcher/settings_watcher.go

@@ -65,6 +65,10 @@ type SettingsWatcher struct {
 	// testingWatcherKnobs allows the client to inject testing knobs into
 	// the underlying rangefeedcache.Watcher.
 	testingWatcherKnobs *rangefeedcache.TestingKnobs
+
+	// rfc provides access to the underlying rangefeedcache.Watcher for
+	// testing.
+	rfc *rangefeedcache.Watcher
 }
 
 // Storage is used to write a snapshot of KVs out to disk for use upon restart.
@@ -216,6 +220,7 @@ func (s *SettingsWatcher) Start(ctx context.Context) error {
 		},
 		s.testingWatcherKnobs,
 	)
+	s.rfc = c
 
 	// Kick off the rangefeedcache which will retry until the stopper stops.
 	if err := rangefeedcache.Start(ctx, s.stopper, c, func(err error) {
@@ -243,6 +248,12 @@ func (s *SettingsWatcher) Start(ctx context.Context) error {
 	}
 }
 
+func (w *SettingsWatcher) TestingRestart() {
+	if w.rfc != nil {
+		w.rfc.TestingRestart()
+	}
+}
+
 func (s *SettingsWatcher) handleKV(
 	ctx context.Context, kv *kvpb.RangeFeedValue,
 ) rangefeedbuffer.Event {

pkg/server/tenantsettingswatcher/watcher.go

@@ -60,6 +60,10 @@ type Watcher struct {
 	// startCh is closed once the rangefeed starts.
 	startCh  chan struct{}
 	startErr error
+
+	// rfc provides access to the underlying rangefeedcache.Watcher for
+	// testing.
+	rfc *rangefeedcache.Watcher
 }
 
 // New constructs a new Watcher.
@@ -182,6 +186,7 @@ func (w *Watcher) startRangeFeed(
 		onUpdate,
 		nil, /* knobs */
 	)
+	w.rfc = c
 
 	// Kick off the rangefeedcache which will retry until the stopper stops.
 	if err := rangefeedcache.Start(ctx, w.stopper, c, onError); err != nil {
@@ -215,6 +220,12 @@ func (w *Watcher) WaitForStart(ctx context.Context) error {
 	}
 }
 
+func (w *Watcher) TestingRestart() {
+	if w.rfc != nil {
+		w.rfc.TestingRestart()
+	}
+}
+
 // GetTenantOverrides returns the current overrides for the given tenant, and a
 // channel that will be closed when the overrides for this tenant change.
 //

pkg/server/testserver.go

@@ -1335,6 +1335,10 @@ func (ts *testServer) waitForTenantReadinessImpl(
 	// waiting out the closed timestamp interval required to see new updates.
 	ts.node.tenantInfoWatcher.TestingRestart()
 
+	// Ditto for cluster settings and setting overrides.
+	ts.sqlServer.settingsWatcher.TestingRestart()
+	ts.node.tenantSettingsWatcher.TestingRestart()
+
 	log.Infof(ctx, "waiting for rangefeed to catch up with record for tenant %v", tenantID)
 
 	// Wait for the watcher to handle the complete update from the initial scan