Skip to content

Commit a09dc3c

Browse files
craig[bot]stevendannamsbutlerfqazi
committed
154934: *: use testutils.SetVModule r=tbg a=stevendanna This replaces most uses of log.SetVModule in tests with testutils.SetVModule, which handles resetting the vmodule back to its original value. Epic: none Release note: None 154980: backup: skip TestBackupExportRequestTimeout under deadlock r=kev-cao a=msbutler Informs #154840 Release note: none 154991: workload/schemachanger: exclude array types for ltree and citext r=fqazi a=fqazi Previously, we added version gates for ltree and citext, but this only included non-array types. This meant we could still incorrectly use arrays of these types in mixed version states. To address this, this patch detects the array variants of these types. Fixes: #154637 Release note: None Co-authored-by: Steven Danna <[email protected]> Co-authored-by: Michael Butler <[email protected]> Co-authored-by: Faizan Qazi <[email protected]>
4 parents 67f33c2 + 46b62fa + c8e25f1 + f0b83e6 commit a09dc3c

21 files changed

+83
-82
lines changed

‎pkg/backup/backup_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7601,6 +7601,8 @@ func TestBackupExportRequestTimeout(t *testing.T) {
76017601
defer leaktest.AfterTest(t)()
76027602
defer log.Scope(t).Close(t)
76037603

7604+
skip.UnderDeadlock(t)
7605+
76047606
allowRequest := make(chan struct{})
76057607
defer close(allowRequest)
76067608

‎pkg/ccl/changefeedccl/alter_changefeed_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func TestAlterChangefeedAddTargetFamily(t *testing.T) {
336336
defer leaktest.AfterTest(t)()
337337
defer log.Scope(t).Close(t)
338338

339-
require.NoError(t, log.SetVModule("helpers_test=1"))
339+
testutils.SetVModule(t, "helpers_test=1")
340340

341341
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
342342
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -394,7 +394,7 @@ func TestAlterChangefeedSwitchFamily(t *testing.T) {
394394
defer leaktest.AfterTest(t)()
395395
defer log.Scope(t).Close(t)
396396

397-
require.NoError(t, log.SetVModule("helpers_test=1"))
397+
testutils.SetVModule(t, "helpers_test=1")
398398

399399
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
400400
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -1316,7 +1316,7 @@ func TestAlterChangefeedAddTargetsDuringSchemaChangeError(t *testing.T) {
13161316
defer log.Scope(t).Close(t)
13171317

13181318
// Set verbose log to confirm whether or not we hit the same nil row issue as in #140669
1319-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
1319+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
13201320

13211321
rnd, seed := randutil.NewPseudoRand()
13221322
t.Logf("random seed: %d", seed)
@@ -1984,7 +1984,7 @@ func TestAlterChangefeedRandomizedTargetChanges(t *testing.T) {
19841984
defer leaktest.AfterTest(t)()
19851985
defer log.Scope(t).Close(t)
19861986

1987-
require.NoError(t, log.SetVModule("helpers_test=1"))
1987+
testutils.SetVModule(t, "helpers_test=1")
19881988

19891989
rnd, _ := randutil.NewPseudoRand()
19901990

‎pkg/ccl/changefeedccl/changefeed_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ func TestChangefeedMultiTable(t *testing.T) {
14001400
func TestChangefeedCursor(t *testing.T) {
14011401
defer leaktest.AfterTest(t)()
14021402
defer log.Scope(t).Close(t)
1403-
require.NoError(t, log.SetVModule("event_processing=3,blocking_buffer=2"))
1403+
testutils.SetVModule(t, "event_processing=3,blocking_buffer=2")
14041404

14051405
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
14061406
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2204,7 +2204,7 @@ func TestNoStopAfterNonTargetColumnDrop(t *testing.T) {
22042204
defer leaktest.AfterTest(t)()
22052205
defer log.Scope(t).Close(t)
22062206

2207-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2207+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
22082208

22092209
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
22102210
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2313,7 +2313,7 @@ func TestNoBackfillAfterNonTargetColumnDrop(t *testing.T) {
23132313
defer leaktest.AfterTest(t)()
23142314
defer log.Scope(t).Close(t)
23152315

2316-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2316+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
23172317

23182318
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
23192319
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2359,7 +2359,7 @@ func TestChangefeedColumnDropsWithFamilyAndNonFamilyTargets(t *testing.T) {
23592359
defer leaktest.AfterTest(t)()
23602360
defer log.Scope(t).Close(t)
23612361

2362-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2362+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
23632363

23642364
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
23652365
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2412,7 +2412,7 @@ func TestChangefeedColumnDropsOnMultipleFamiliesWithTheSameName(t *testing.T) {
24122412
defer leaktest.AfterTest(t)()
24132413
defer log.Scope(t).Close(t)
24142414

2415-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2415+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
24162416

24172417
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
24182418
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2466,7 +2466,7 @@ func TestChangefeedColumnDropsOnTheSameTableWithMultipleFamilies(t *testing.T) {
24662466
defer leaktest.AfterTest(t)()
24672467
defer log.Scope(t).Close(t)
24682468

2469-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2469+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
24702470

24712471
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
24722472
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2510,7 +2510,7 @@ func TestChangefeedColumnDropsOnTheSameTableWithMultipleFamiliesWithManualSchema
25102510
defer leaktest.AfterTest(t)()
25112511
defer log.Scope(t).Close(t)
25122512

2513-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2513+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
25142514

25152515
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
25162516
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2556,7 +2556,7 @@ func TestNoStopAfterNonTargetAddColumnWithBackfill(t *testing.T) {
25562556
defer leaktest.AfterTest(t)()
25572557
defer log.Scope(t).Close(t)
25582558

2559-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2559+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
25602560

25612561
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
25622562
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2658,7 +2658,7 @@ func TestChangefeedSchemaChangeNoBackfill(t *testing.T) {
26582658
defer log.Scope(t).Close(t)
26592659
skip.UnderRace(t, "takes >1 min under race")
26602660

2661-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
2661+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
26622662

26632663
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
26642664
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3306,7 +3306,7 @@ func TestChangefeedSchemaChangeAllowBackfill_Legacy(t *testing.T) {
33063306
defer leaktest.AfterTest(t)()
33073307
defer log.Scope(t).Close(t)
33083308

3309-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3309+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
33103310

33113311
testFn := func(t *testing.T, s TestServerWithSystem, f cdctest.TestFeedFactory) {
33123312
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3504,7 +3504,7 @@ func TestChangefeedSchemaChangeAllowBackfill(t *testing.T) {
35043504
defer leaktest.AfterTest(t)()
35053505
defer log.Scope(t).Close(t)
35063506

3507-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3507+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
35083508

35093509
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
35103510
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3666,7 +3666,7 @@ func TestChangefeedSchemaChangeBackfillScope(t *testing.T) {
36663666
defer leaktest.AfterTest(t)()
36673667
defer log.Scope(t).Close(t)
36683668

3669-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3669+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
36703670

36713671
testFn := func(t *testing.T, s TestServerWithSystem, f cdctest.TestFeedFactory) {
36723672
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3730,7 +3730,7 @@ func TestChangefeedAfterSchemaChangeBackfill(t *testing.T) {
37303730
defer leaktest.AfterTest(t)()
37313731
defer log.Scope(t).Close(t)
37323732

3733-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3733+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
37343734

37353735
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
37363736
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3762,7 +3762,7 @@ func TestChangefeedEachColumnFamily(t *testing.T) {
37623762
defer leaktest.AfterTest(t)()
37633763
defer log.Scope(t).Close(t)
37643764

3765-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3765+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
37663766

37673767
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
37683768

@@ -3892,7 +3892,7 @@ func TestChangefeedSingleColumnFamilySchemaChanges(t *testing.T) {
38923892
defer leaktest.AfterTest(t)()
38933893
defer log.Scope(t).Close(t)
38943894

3895-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3895+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
38963896

38973897
// requireErrorSoon times out after 30 seconds
38983898
skip.UnderStress(t)
@@ -3939,7 +3939,7 @@ func TestChangefeedEachColumnFamilySchemaChanges(t *testing.T) {
39393939
defer leaktest.AfterTest(t)()
39403940
defer log.Scope(t).Close(t)
39413941

3942-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
3942+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
39433943

39443944
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
39453945
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -6456,7 +6456,7 @@ func TestChangefeedTruncateOrDrop(t *testing.T) {
64566456
defer leaktest.AfterTest(t)()
64576457
defer log.Scope(t).Close(t)
64586458

6459-
require.NoError(t, log.SetVModule("table_event_filter=2"))
6459+
testutils.SetVModule(t, "table_event_filter=2")
64606460

64616461
assertFailuresCounter := func(t *testing.T, m *Metrics, exp int64) {
64626462
t.Helper()
@@ -8657,8 +8657,8 @@ func TestChangefeedTimelyResolvedTimestampUpdatePostRollingRestart(t *testing.T)
86578657
defer log.Scope(t).Close(t)
86588658

86598659
// Add verbose logging to help debug future failures.
8660-
require.NoError(t, log.SetVModule("changefeed_processors=1,replica_rangefeed=2,"+
8661-
"replica_range_lease=3,raft=3"))
8660+
testutils.SetVModule(t, "changefeed_processors=1,replica_rangefeed=2,"+
8661+
"replica_range_lease=3,raft=3")
86628662

86638663
// This test requires many range splits, which can be slow under certain test
86648664
// conditions. Skip potentially slow tests.
@@ -10997,7 +10997,7 @@ func TestSchemachangeDoesNotBreakSinklessFeed(t *testing.T) {
1099710997
defer leaktest.AfterTest(t)()
1099810998
defer log.Scope(t).Close(t)
1099910999

11000-
require.NoError(t, log.SetVModule("kv_feed=2,changefeed_processors=2"))
11000+
testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
1100111001

1100211002
testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
1100311003
sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -11876,7 +11876,7 @@ func TestChangefeedHeadersJSONVals(t *testing.T) {
1187611876
defer leaktest.AfterTest(t)()
1187711877
defer log.Scope(t).Close(t)
1187811878

11879-
require.NoError(t, log.SetVModule("event_processing=3"))
11879+
testutils.SetVModule(t, "event_processing=3")
1188011880

1188111881
// Make it easier to test the logs.
1188211882
jsonHeaderWrongValTypeLogLim = log.Every(0)

‎pkg/ccl/changefeedccl/protected_timestamps_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ func TestPTSRecordProtectsTargetsAndSystemTables(t *testing.T) {
562562
ctx := context.Background()
563563

564564
// Useful for debugging.
565-
require.NoError(t, log.SetVModule("spanconfigstore=2,store=2,reconciler=3,mvcc_gc_queue=2,kvaccessor=2"))
565+
testutils.SetVModule(t, "spanconfigstore=2,store=2,reconciler=3,mvcc_gc_queue=2,kvaccessor=2")
566566

567567
settings := cluster.MakeTestingClusterSettings()
568568
spanconfigjob.ReconciliationJobCheckpointInterval.Override(ctx, &settings.SV, 1*time.Second)

‎pkg/ccl/multiregionccl/regionliveness_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ func TestRegionLivenessProber(t *testing.T) {
6363
defer leaktest.AfterTest(t)()
6464
defer log.Scope(t).Close(t)
6565
// Force extra logging to diagnose flakes.
66-
require.NoError(t, log.SetVModule("prober=2"))
66+
testutils.SetVModule(t, "prober=2")
67+
6768
// This test forces the SQL liveness TTL be a small number,
6869
// which makes the heartbeats even more critical. Under stress and
6970
// race environments this test becomes even more sensitive, if

‎pkg/cloud/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ go_test(
5252
embed = [":cloud"],
5353
deps = [
5454
"//pkg/cloud/cloudpb",
55+
"//pkg/testutils",
5556
"//pkg/util/ioctx",
5657
"//pkg/util/log",
5758
"@com_github_cockroachdb_errors//:errors",

‎pkg/cloud/amazon/s3_storage_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ func TestS3FaultInjection(t *testing.T) {
225225

226226
// Enable cloud transport logging.
227227
defer log.Scope(t).Close(t)
228-
prevVModule := log.GetVModule()
229-
defer func() { _ = log.SetVModule(prevVModule) }()
230-
require.NoError(t, log.SetVModule("cloud_logging_transport=1"))
228+
testutils.SetVModule(t, "cloud_logging_transport=1")
231229

232230
uri := fmt.Sprintf(
233231
"s3://%s/%d-fault-injection-test?AUTH=implicit",

‎pkg/cloud/azure/azure_storage_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,7 @@ func TestAzureFaultInjection(t *testing.T) {
165165

166166
// Enable cloud transport logging.
167167
defer log.Scope(t).Close(t)
168-
prevVModule := log.GetVModule()
169-
defer func() { _ = log.SetVModule(prevVModule) }()
170-
require.NoError(t, log.SetVModule("cloud_logging_transport=1"))
168+
testutils.SetVModule(t, "cloud_logging_transport=1")
171169

172170
testID := cloudtestutils.NewTestID()
173171
uri := cfg.filePathImplicitAuth(fmt.Sprintf("%d-fault-injection-test", testID))

‎pkg/cloud/cloud_logging_transport_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,23 @@ import (
1313
"strings"
1414
"testing"
1515

16+
"github.com/cockroachdb/cockroach/pkg/testutils"
1617
"github.com/cockroachdb/cockroach/pkg/util/log"
1718
"github.com/cockroachdb/redact"
1819
"github.com/stretchr/testify/require"
1920
)
2021

22+
// TestMaybeAddLogging tests that logging is only added when log.V(1) is true.
2123
func TestMaybeAddLogging(t *testing.T) {
22-
// Test that logging is only added when log.V(1) is true
23-
originalVModule := log.GetVModule()
24-
defer func() { _ = log.SetVModule(originalVModule) }()
25-
2624
t.Run("logging-disabled", func(t *testing.T) {
27-
_ = log.SetVModule("")
25+
testutils.SetVModule(t, "")
2826
inner := &http.Transport{}
2927
result := maybeAddLogging(inner)
3028
require.Equal(t, inner, result, "should return inner transport when logging is disabled")
3129
})
3230

3331
t.Run("logging-enabled", func(t *testing.T) {
34-
_ = log.SetVModule("*=1")
32+
testutils.SetVModule(t, "*=1")
3533
inner := &http.Transport{}
3634
result := maybeAddLogging(inner)
3735
require.NotEqual(t, inner, result, "should return wrapped transport when logging is enabled")

‎pkg/cloud/gcp/gcs_storage_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,7 @@ func TestGCSFaultInjection(t *testing.T) {
313313

314314
// Enable cloud transport logging.
315315
defer log.Scope(t).Close(t)
316-
prevVModule := log.GetVModule()
317-
defer func() { _ = log.SetVModule(prevVModule) }()
318-
require.NoError(t, log.SetVModule("cloud_logging_transport=1"))
316+
testutils.SetVModule(t, "cloud_logging_transport=1")
319317

320318
testID := cloudtestutils.NewTestID()
321319
uri := fmt.Sprintf("gs://%s/%d-fault-injection-test?AUTH=implicit", bucket, testID)

0 commit comments

Comments
 (0)