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

…-23.2.5-rc-123370 release-23.2.5-rc: changefeedccl: disable drain watcher by default
cockroachdb · May 3, 2024 · 57ab107 · 57ab107
2 parents 2329856 + b4b15f8
commit 57ab107
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/ccl/changefeedccl/changefeed_processors.go b/pkg/ccl/changefeedccl/changefeed_processors.go
@@ -137,7 +137,7 @@ var aggregatorEmitsShutdownCheckpoint = settings.RegisterBoolSetting(
 	settings.ApplicationLevel,
 	"changefeed.shutdown_checkpoint.enabled",
 	"upon shutdown aggregator attempts to emit an up-to-date checkpoint",
-	true,
+	false,
 )
 
 type drainWatcher <-chan struct{}

diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go
@@ -6207,6 +6207,7 @@ func TestChangefeedHandlesRollingRestart(t *testing.T) {
 
 	db := tc.ServerConn(1)
 	sqlDB := sqlutils.MakeSQLRunner(db)
+	serverutils.SetClusterSetting(t, tc, "changefeed.shutdown_checkpoint.enabled", true)
 	serverutils.SetClusterSetting(t, tc, "kv.rangefeed.enabled", true)
 	serverutils.SetClusterSetting(t, tc, "kv.closed_timestamp.target_duration", 10*time.Millisecond)
 	serverutils.SetClusterSetting(t, tc, "changefeed.experimental_poll_interval", 10*time.Millisecond)