Merge pull request #99824 from cockroachdb/blathers/backport-release-…

…22.2-99745

release-22.2: spanconfigsqlwatcher: deflake TestSQLWatcherOnEventError

pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/sqlwatcher_test.go

@@ -437,18 +437,18 @@ func TestSQLWatcherOnEventError(t *testing.T) {
 	tdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
 	tdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)
 
-	noopCheckpointDuration := time.Hour // effectively disable no-op checkpoints
 	sqlWatcher := spanconfigsqlwatcher.New(
 		keys.SystemSQLCodec,
 		ts.ClusterSettings(),
 		ts.RangeFeedFactory().(*rangefeed.Factory),
 		1<<20, /* 1 MB, bufferMemLimit */
 		ts.Stopper(),
-		noopCheckpointDuration,
+		time.Second, // doesn't matter
 		&spanconfig.TestingKnobs{
 			SQLWatcherOnEventInterceptor: func() error {
 				return errors.New("boom")
 			},
+			SQLWatcherSkipNoopCheckpoints: true,
 		},
 	)
 

pkg/spanconfig/spanconfigsqlwatcher/sqlwatcher.go

@@ -169,7 +169,8 @@ func (s *SQLWatcher) watch(
 			if err != nil {
 				return err
 			}
-			if len(sqlUpdates) == 0 && !checkpointNoops.ShouldProcess(timeutil.Now()) {
+			if len(sqlUpdates) == 0 &&
+				(!checkpointNoops.ShouldProcess(timeutil.Now()) || s.knobs.SQLWatcherSkipNoopCheckpoints) {
 				continue
 			}
 			if err := handler(ctx, sqlUpdates, combinedFrontierTS); err != nil {

pkg/spanconfig/testing_knobs.go

@@ -88,6 +88,10 @@ type TestingKnobs struct {
 	// often the SQLWatcher checkpoints noops.
 	SQLWatcherCheckpointNoopsEveryDurationOverride time.Duration
 
+	// SQLWatcherSkipNoopCheckpoints allows tests to skip no-op checkpoints
+	// entirely.
+	SQLWatcherSkipNoopCheckpoints bool
+
 	// SplitterStepLogger is used to capture internal steps the splitter is
 	// making, for debugging and test-readability purposes.
 	SplitterStepLogger func(string)