testutils: use t.Cleanup in SetVModule

stevendanna · stevendanna · commit 46b62fa2d097 · 2025-10-07T21:49:43.000+01:00
This avoids the potential for someone to forget to defer the returned
func.

Epic: none
Release note: None
diff --git a/pkg/ccl/changefeedccl/alter_changefeed_test.go b/pkg/ccl/changefeedccl/alter_changefeed_test.go
@@ -336,7 +336,7 @@ func TestAlterChangefeedAddTargetFamily(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "helpers_test=1")()
+	testutils.SetVModule(t, "helpers_test=1")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -394,7 +394,7 @@ func TestAlterChangefeedSwitchFamily(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "helpers_test=1")()
+	testutils.SetVModule(t, "helpers_test=1")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -1316,7 +1316,7 @@ func TestAlterChangefeedAddTargetsDuringSchemaChangeError(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	// Set verbose log to confirm whether or not we hit the same nil row issue as in #140669
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	rnd, seed := randutil.NewPseudoRand()
 	t.Logf("random seed: %d", seed)
@@ -1984,7 +1984,7 @@ func TestAlterChangefeedRandomizedTargetChanges(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "helpers_test=1")()
+	testutils.SetVModule(t, "helpers_test=1")
 
 	rnd, _ := randutil.NewPseudoRand()
 
diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go
@@ -1400,7 +1400,7 @@ func TestChangefeedMultiTable(t *testing.T) {
 func TestChangefeedCursor(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	defer testutils.SetVModule(t, "event_processing=3,blocking_buffer=2")()
+	testutils.SetVModule(t, "event_processing=3,blocking_buffer=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2204,7 +2204,7 @@ func TestNoStopAfterNonTargetColumnDrop(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2313,7 +2313,7 @@ func TestNoBackfillAfterNonTargetColumnDrop(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2359,7 +2359,7 @@ func TestChangefeedColumnDropsWithFamilyAndNonFamilyTargets(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2412,7 +2412,7 @@ func TestChangefeedColumnDropsOnMultipleFamiliesWithTheSameName(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2466,7 +2466,7 @@ func TestChangefeedColumnDropsOnTheSameTableWithMultipleFamilies(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2510,7 +2510,7 @@ func TestChangefeedColumnDropsOnTheSameTableWithMultipleFamiliesWithManualSchema
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2556,7 +2556,7 @@ func TestNoStopAfterNonTargetAddColumnWithBackfill(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -2658,7 +2658,7 @@ func TestChangefeedSchemaChangeNoBackfill(t *testing.T) {
 	defer log.Scope(t).Close(t)
 	skip.UnderRace(t, "takes >1 min under race")
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3306,7 +3306,7 @@ func TestChangefeedSchemaChangeAllowBackfill_Legacy(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServerWithSystem, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3504,7 +3504,7 @@ func TestChangefeedSchemaChangeAllowBackfill(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3666,7 +3666,7 @@ func TestChangefeedSchemaChangeBackfillScope(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServerWithSystem, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3730,7 +3730,7 @@ func TestChangefeedAfterSchemaChangeBackfill(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -3762,7 +3762,7 @@ func TestChangefeedEachColumnFamily(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 
@@ -3892,7 +3892,7 @@ func TestChangefeedSingleColumnFamilySchemaChanges(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	// requireErrorSoon times out after 30 seconds
 	skip.UnderStress(t)
@@ -3939,7 +3939,7 @@ func TestChangefeedEachColumnFamilySchemaChanges(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -6456,7 +6456,7 @@ func TestChangefeedTruncateOrDrop(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "table_event_filter=2")()
+	testutils.SetVModule(t, "table_event_filter=2")
 
 	assertFailuresCounter := func(t *testing.T, m *Metrics, exp int64) {
 		t.Helper()
@@ -8657,8 +8657,8 @@ func TestChangefeedTimelyResolvedTimestampUpdatePostRollingRestart(t *testing.T)
 	defer log.Scope(t).Close(t)
 
 	// Add verbose logging to help debug future failures.
-	defer testutils.SetVModule(t, "changefeed_processors=1,replica_rangefeed=2,"+
-		"replica_range_lease=3,raft=3")()
+	testutils.SetVModule(t, "changefeed_processors=1,replica_rangefeed=2,"+
+		"replica_range_lease=3,raft=3")
 
 	// This test requires many range splits, which can be slow under certain test
 	// conditions. Skip potentially slow tests.
@@ -10997,7 +10997,7 @@ func TestSchemachangeDoesNotBreakSinklessFeed(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")()
+	testutils.SetVModule(t, "kv_feed=2,changefeed_processors=2")
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		sqlDB := sqlutils.MakeSQLRunner(s.DB)
@@ -11876,7 +11876,7 @@ func TestChangefeedHeadersJSONVals(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "event_processing=3")()
+	testutils.SetVModule(t, "event_processing=3")
 
 	// Make it easier to test the logs.
 	jsonHeaderWrongValTypeLogLim = log.Every(0)
diff --git a/pkg/ccl/changefeedccl/protected_timestamps_test.go b/pkg/ccl/changefeedccl/protected_timestamps_test.go
@@ -562,7 +562,7 @@ func TestPTSRecordProtectsTargetsAndSystemTables(t *testing.T) {
 	ctx := context.Background()
 
 	// Useful for debugging.
-	defer testutils.SetVModule(t, "spanconfigstore=2,store=2,reconciler=3,mvcc_gc_queue=2,kvaccessor=2")()
+	testutils.SetVModule(t, "spanconfigstore=2,store=2,reconciler=3,mvcc_gc_queue=2,kvaccessor=2")
 
 	settings := cluster.MakeTestingClusterSettings()
 	spanconfigjob.ReconciliationJobCheckpointInterval.Override(ctx, &settings.SV, 1*time.Second)
diff --git a/pkg/ccl/multiregionccl/regionliveness_test.go b/pkg/ccl/multiregionccl/regionliveness_test.go
@@ -63,7 +63,7 @@ func TestRegionLivenessProber(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 	// Force extra logging to diagnose flakes.
-	defer testutils.SetVModule(t, "prober=2")()
+	testutils.SetVModule(t, "prober=2")
 
 	// This test forces the SQL liveness TTL be a small number,
 	// which makes the heartbeats even more critical. Under stress and
diff --git a/pkg/cloud/amazon/s3_storage_test.go b/pkg/cloud/amazon/s3_storage_test.go
@@ -225,7 +225,7 @@ func TestS3FaultInjection(t *testing.T) {
 
 	// Enable cloud transport logging.
 	defer log.Scope(t).Close(t)
-	defer testutils.SetVModule(t, "cloud_logging_transport=1")()
+	testutils.SetVModule(t, "cloud_logging_transport=1")
 
 	uri := fmt.Sprintf(
 		"s3://%s/%d-fault-injection-test?AUTH=implicit",
diff --git a/pkg/cloud/azure/azure_storage_test.go b/pkg/cloud/azure/azure_storage_test.go
@@ -165,7 +165,7 @@ func TestAzureFaultInjection(t *testing.T) {
 
 	// Enable cloud transport logging.
 	defer log.Scope(t).Close(t)
-	defer testutils.SetVModule(t, "cloud_logging_transport=1")()
+	testutils.SetVModule(t, "cloud_logging_transport=1")
 
 	testID := cloudtestutils.NewTestID()
 	uri := cfg.filePathImplicitAuth(fmt.Sprintf("%d-fault-injection-test", testID))
diff --git a/pkg/cloud/cloud_logging_transport_test.go b/pkg/cloud/cloud_logging_transport_test.go
@@ -22,14 +22,14 @@ import (
 // TestMaybeAddLogging tests that logging is only added when log.V(1) is true.
 func TestMaybeAddLogging(t *testing.T) {
 	t.Run("logging-disabled", func(t *testing.T) {
-		defer testutils.SetVModule(t, "")()
+		testutils.SetVModule(t, "")
 		inner := &http.Transport{}
 		result := maybeAddLogging(inner)
 		require.Equal(t, inner, result, "should return inner transport when logging is disabled")
 	})
 
 	t.Run("logging-enabled", func(t *testing.T) {
-		defer testutils.SetVModule(t, "*=1")()
+		testutils.SetVModule(t, "*=1")
 		inner := &http.Transport{}
 		result := maybeAddLogging(inner)
 		require.NotEqual(t, inner, result, "should return wrapped transport when logging is enabled")
diff --git a/pkg/cloud/gcp/gcs_storage_test.go b/pkg/cloud/gcp/gcs_storage_test.go
@@ -313,7 +313,7 @@ func TestGCSFaultInjection(t *testing.T) {
 
 	// Enable cloud transport logging.
 	defer log.Scope(t).Close(t)
-	defer testutils.SetVModule(t, "cloud_logging_transport=1")()
+	testutils.SetVModule(t, "cloud_logging_transport=1")
 
 	testID := cloudtestutils.NewTestID()
 	uri := fmt.Sprintf("gs://%s/%d-fault-injection-test?AUTH=implicit", bucket, testID)
diff --git a/pkg/kv/kvserver/client_replica_circuit_breaker_test.go b/pkg/kv/kvserver/client_replica_circuit_breaker_test.go
@@ -794,7 +794,7 @@ func TestReplicaCircuitBreaker_Partial_Retry(t *testing.T) {
 	skip.UnderDeadlock(t)
 
 	// To help debug issues like #154179.
-	defer testutils.SetVModule(t, "dist_sender=3")()
+	testutils.SetVModule(t, "dist_sender=3")
 
 	testutils.RunValues(t, "lease-type", roachpb.ExpirationAndLeaderLeaseType(),
 		func(t *testing.T, leaseType roachpb.LeaseType) {
diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go
@@ -778,7 +778,7 @@ func TestTxnReadWithinUncertaintyIntervalAfterLeaseTransfer(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	// Increase the verbosity of the test to help investigate failures.
-	defer testutils.SetVModule(t, "replica_range_lease=3,raft=4,txn=3,txn_coord_sender=3")()
+	testutils.SetVModule(t, "replica_range_lease=3,raft=4,txn=3,txn_coord_sender=3")
 	const numNodes = 2
 	var manuals []*hlc.HybridManualClock
 	var clocks []*hlc.Clock
@@ -2955,7 +2955,7 @@ func TestLossQuorumCauseLeaderlessWatcherToSignalUnavailable(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	// Increase the verbosity of the test to help investigate failures.
-	defer testutils.SetVModule(t, "replica_range_lease=3,raft=4")()
+	testutils.SetVModule(t, "replica_range_lease=3,raft=4")
 
 	ctx := context.Background()
 	stickyVFSRegistry := fs.NewStickyRegistry()
@@ -6072,7 +6072,7 @@ func TestLeaseTransferReplicatesLocks(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "cmd_lease=2")()
+	testutils.SetVModule(t, "cmd_lease=2")
 
 	// Test Setup:
 	//
@@ -6182,7 +6182,7 @@ func TestLeaseTransferDropsLocksIfLargerThanCommandSize(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "cmd_lease=2")()
+	testutils.SetVModule(t, "cmd_lease=2")
 
 	// Test Plan:
 	//
@@ -6233,7 +6233,7 @@ func TestMergeDropsLocksIfLargerThanMax(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	defer testutils.SetVModule(t, "cmd_subsume=2")()
+	testutils.SetVModule(t, "cmd_subsume=2")
 
 	// Test Plan:
 	//
diff --git a/pkg/kv/kvserver/client_split_test.go b/pkg/kv/kvserver/client_split_test.go
@@ -1084,7 +1084,7 @@ func TestStoreRangeSplitWithTracing(t *testing.T) {
 	defer log.Scope(t).Close(t)
 	l := log.ScopeWithoutShowLogs(t)
 	defer l.Close(t)
-	defer testutils.SetVModule(t, "split_queue=1")()
+	testutils.SetVModule(t, "split_queue=1")
 
 	splitKey := roachpb.Key("b")
 	var targetRange atomic.Int32
diff --git a/pkg/kv/kvserver/closed_timestamp_test.go b/pkg/kv/kvserver/closed_timestamp_test.go
@@ -628,7 +628,7 @@ func TestClosedTimestampFrozenAfterSubsumption(t *testing.T) {
 
 	// Increase the verbosity of the logs to help debug the test if it fails, especially
 	// raft related logs when the test tries to transfer the lease non-cooperatively.
-	defer testutils.SetVModule(t, "raft=4,*=1")()
+	testutils.SetVModule(t, "raft=4,*=1")
 
 	for _, test := range []struct {
 		name string
diff --git a/pkg/kv/kvserver/flow_control_integration_test.go b/pkg/kv/kvserver/flow_control_integration_test.go
diff --git a/pkg/kv/kvserver/kvflowcontrol/rac2/store_stream_test.go b/pkg/kv/kvserver/kvflowcontrol/rac2/store_stream_test.go
diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go
diff --git a/pkg/storage/pebble_test.go b/pkg/storage/pebble_test.go
diff --git a/pkg/testutils/trace.go b/pkg/testutils/trace.go
