Skip to content

spanconfigsqlwatcherccl: enable multitenant testing #160591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig merged 1 commit into from
Jan 7, 2026
+27 −20
Merged

spanconfigsqlwatcherccl: enable multitenant testing #160591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ go_test(
"//pkg/testutils/testcluster",
"//pkg/util/hlc",
"//pkg/util/leaktest",
"//pkg/util/log",
"//pkg/util/randutil",
"//pkg/util/syncutil",
"@com_github_cockroachdb_errors//:errors",
Expand Down
46 changes: 26 additions & 20 deletions pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl/sqlwatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
"github.com/cockroachdb/errors"
"github.com/stretchr/testify/require"
Expand All @@ -42,6 +43,7 @@ import (
// increasing.
func TestSQLWatcherReactsToUpdates(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

var idBase descpb.ID
id := func(n int) descpb.ID {
Expand Down Expand Up @@ -283,6 +285,7 @@ func TestSQLWatcherReactsToUpdates(t *testing.T) {
// processes, both sequentially and concurrently.
func TestSQLWatcherMultiple(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.UnderRace(t, "slow test")

tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{
Expand All @@ -306,8 +309,8 @@ func TestSQLWatcherMultiple(t *testing.T) {
noopCheckpointDuration := 100 * time.Millisecond
sqlWatcher := spanconfigsqlwatcher.New(
ts.ApplicationLayer().Codec(),
ts.ClusterSettings(),
ts.RangeFeedFactory().(*rangefeed.Factory),
ts.ApplicationLayer().ClusterSettings(),
ts.ApplicationLayer().RangeFeedFactory().(*rangefeed.Factory),
1<<20, /* 1 MB, bufferMemLimit */
ts.Stopper(),
noopCheckpointDuration,
Expand Down Expand Up @@ -415,10 +418,10 @@ func TestSQLWatcherMultiple(t *testing.T) {
// the caller.
func TestSQLWatcherOnEventError(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(106821),
Knobs: base.TestingKnobs{
SpanConfig: &spanconfig.TestingKnobs{
ManagerDisableJobCreation: true, // disable the automatic job creation.
Expand All @@ -431,13 +434,14 @@ func TestSQLWatcherOnEventError(t *testing.T) {
defer tc.Stopper().Stop(ctx)
ts := tc.Server(0 /* idx */)
tdb := sqlutils.MakeSQLRunner(tc.ServerConn(0 /* idx */))
tdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
tdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)
sdb := sqlutils.MakeSQLRunner(tc.SystemLayer(0).SQLConn(t))
sdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
sdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)

sqlWatcher := spanconfigsqlwatcher.New(
ts.Codec(),
ts.ClusterSettings(),
ts.RangeFeedFactory().(*rangefeed.Factory),
ts.ApplicationLayer().Codec(),
ts.ApplicationLayer().ClusterSettings(),
ts.ApplicationLayer().RangeFeedFactory().(*rangefeed.Factory),
1<<20, /* 1 MB, bufferMemLimit */
ts.Stopper(),
time.Second, // doesn't matter
Expand Down Expand Up @@ -465,10 +469,10 @@ func TestSQLWatcherOnEventError(t *testing.T) {
// handler after it returns an error.
func TestSQLWatcherHandlerError(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(106821),
Knobs: base.TestingKnobs{
SpanConfig: &spanconfig.TestingKnobs{
ManagerDisableJobCreation: true, // disable the automatic job creation.
Expand All @@ -481,14 +485,15 @@ func TestSQLWatcherHandlerError(t *testing.T) {
defer tc.Stopper().Stop(ctx)
ts := tc.Server(0 /* idx */)
tdb := sqlutils.MakeSQLRunner(tc.ServerConn(0 /* idx */))
tdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
tdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)
sdb := sqlutils.MakeSQLRunner(tc.SystemLayer(0).SQLConn(t))
sdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
sdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)

noopCheckpointDuration := 100 * time.Millisecond
sqlWatcher := spanconfigsqlwatcher.New(
ts.Codec(),
ts.ClusterSettings(),
ts.RangeFeedFactory().(*rangefeed.Factory),
ts.ApplicationLayer().Codec(),
ts.ApplicationLayer().ClusterSettings(),
ts.ApplicationLayer().RangeFeedFactory().(*rangefeed.Factory),
1<<20, /* 1 MB, bufferMemLimit */
ts.Stopper(),
noopCheckpointDuration,
Expand Down Expand Up @@ -542,10 +547,10 @@ func TestSQLWatcherHandlerError(t *testing.T) {

func TestWatcherReceivesNoopCheckpoints(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(106821),
Knobs: base.TestingKnobs{
SpanConfig: &spanconfig.TestingKnobs{
ManagerDisableJobCreation: true, // disable the automatic job creation.
Expand All @@ -558,14 +563,15 @@ func TestWatcherReceivesNoopCheckpoints(t *testing.T) {
defer tc.Stopper().Stop(ctx)
ts := tc.Server(0 /* idx */)
tdb := sqlutils.MakeSQLRunner(tc.ServerConn(0 /* idx */))
tdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
tdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)
sdb := sqlutils.MakeSQLRunner(tc.SystemLayer(0).SQLConn(t))
sdb.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
sdb.Exec(t, `SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'`)

noopCheckpointDuration := 25 * time.Millisecond
sqlWatcher := spanconfigsqlwatcher.New(
ts.Codec(),
ts.ClusterSettings(),
ts.RangeFeedFactory().(*rangefeed.Factory),
ts.ApplicationLayer().Codec(),
ts.ApplicationLayer().ClusterSettings(),
ts.ApplicationLayer().RangeFeedFactory().(*rangefeed.Factory),
1<<20, /* 1 MB, bufferMemLimit */
ts.Stopper(),
noopCheckpointDuration,
Expand Down