Merge pull request #156015 from rickystewart/blathers/backport-release-25.4-155482

rickystewart · web-flow · commit 133c00bde464 · 2025-10-31T14:56:56.000-05:00
release-25.4: *: fix lint errors and remove empty tests
diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
@@ -96,7 +96,6 @@ ALL_TESTS = [
     "//pkg/ccl/spanconfigccl/spanconfigsqltranslatorccl:spanconfigsqltranslatorccl_test",
     "//pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl:spanconfigsqlwatcherccl_test",
     "//pkg/ccl/sqlitelogictestccl/tests/3node-tenant:3node-tenant_test",
-    "//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl_test",
     "//pkg/ccl/sqlproxyccl/acl:acl_test",
     "//pkg/ccl/sqlproxyccl/balancer:balancer_test",
     "//pkg/ccl/sqlproxyccl/interceptor:interceptor_test",
@@ -119,7 +118,6 @@ ALL_TESTS = [
     "//pkg/cli/clisqlexec:clisqlexec_test",
     "//pkg/cli/clisqlshell:clisqlshell_test",
     "//pkg/cli/democluster:democluster_test",
-    "//pkg/cli/exit:exit_test",
     "//pkg/cli:cli_disallowed_imports_test",
     "//pkg/cli:cli_test",
     "//pkg/cloud/amazon:amazon_test",
@@ -212,7 +210,6 @@ ALL_TESTS = [
     "//pkg/jobs/jobsauth:jobsauth_test",
     "//pkg/jobs/jobspb:jobspb_test",
     "//pkg/jobs/jobsprofiler:jobsprofiler_test",
-    "//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
     "//pkg/jobs:jobs_test",
     "//pkg/keys:keys_test",
     "//pkg/keyvisualizer/spanstatsconsumer:spanstatsconsumer_test",
@@ -390,9 +387,7 @@ ALL_TESTS = [
     "//pkg/spanconfig/spanconfigkvsubscriber:spanconfigkvsubscriber_test",
     "//pkg/spanconfig/spanconfigmanager:spanconfigmanager_test",
     "//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader_test",
-    "//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler_test",
     "//pkg/spanconfig/spanconfigreporter:spanconfigreporter_test",
-    "//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator_test",
     "//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher_test",
     "//pkg/spanconfig/spanconfigstore:spanconfigstore_test",
     "//pkg/spanconfig/spanconfigtestutils:spanconfigtestutils_test",
@@ -866,7 +861,6 @@ ALL_TESTS = [
     "//pkg/workload/workload_generator:workload_generator_test",
     "//pkg/workload/workloadimpl:workloadimpl_test",
     "//pkg/workload/workloadsql:workloadsql_test",
-    "//pkg/workload/ycsb:ycsb_test",
     "//pkg/workload:workload_test",
 ]
 
@@ -1054,7 +1048,6 @@ GO_TARGETS = [
     "//pkg/ccl/spanconfigccl/spanconfigsqlwatcherccl:spanconfigsqlwatcherccl_test",
     "//pkg/ccl/sqlitelogictestccl/tests/3node-tenant:3node-tenant_test",
     "//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl",
-    "//pkg/ccl/sqlitelogictestccl:sqlitelogictestccl_test",
     "//pkg/ccl/sqlproxyccl/acl:acl",
     "//pkg/ccl/sqlproxyccl/acl:acl_test",
     "//pkg/ccl/sqlproxyccl/balancer:balancer",
@@ -1109,7 +1102,6 @@ GO_TARGETS = [
     "//pkg/cli/democluster:democluster",
     "//pkg/cli/democluster:democluster_test",
     "//pkg/cli/exit:exit",
-    "//pkg/cli/exit:exit_test",
     "//pkg/cli/syncbench:syncbench",
     "//pkg/cli:cli",
     "//pkg/cli:cli_test",
@@ -1439,7 +1431,6 @@ GO_TARGETS = [
     "//pkg/jobs/jobsprofiler:jobsprofiler",
     "//pkg/jobs/jobsprofiler:jobsprofiler_test",
     "//pkg/jobs/jobsprotectedts:jobsprotectedts",
-    "//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
     "//pkg/jobs/jobstest:jobstest",
     "//pkg/jobs/metricspoller:metricspoller",
     "//pkg/jobs:jobs",
@@ -1867,12 +1858,10 @@ GO_TARGETS = [
     "//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader",
     "//pkg/spanconfig/spanconfigptsreader:spanconfigptsreader_test",
     "//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler",
-    "//pkg/spanconfig/spanconfigreconciler:spanconfigreconciler_test",
     "//pkg/spanconfig/spanconfigreporter:spanconfigreporter",
     "//pkg/spanconfig/spanconfigreporter:spanconfigreporter_test",
     "//pkg/spanconfig/spanconfigsplitter:spanconfigsplitter",
     "//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator",
-    "//pkg/spanconfig/spanconfigsqltranslator:spanconfigsqltranslator_test",
     "//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher",
     "//pkg/spanconfig/spanconfigsqlwatcher:spanconfigsqlwatcher_test",
     "//pkg/spanconfig/spanconfigstore:spanconfigstore",
@@ -2920,7 +2909,6 @@ GO_TARGETS = [
     "//pkg/workload/workloadsql:workloadsql",
     "//pkg/workload/workloadsql:workloadsql_test",
     "//pkg/workload/ycsb:ycsb",
-    "//pkg/workload/ycsb:ycsb_test",
     "//pkg/workload:workload",
     "//pkg/workload:workload_test",
 ]
diff --git a/pkg/ccl/changefeedccl/schema_registry.go b/pkg/ccl/changefeedccl/schema_registry.go
@@ -302,7 +302,7 @@ func gracefulClose(ctx context.Context, toClose io.ReadCloser) {
 	const respExtraReadLimit = 4096
 	_, _ = io.CopyN(io.Discard, toClose, respExtraReadLimit)
 	if err := toClose.Close(); err != nil {
-		log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection", err)
+		log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection: %+v", err)
 	}
 }
 
diff --git a/pkg/ccl/sqlitelogictestccl/BUILD.bazel b/pkg/ccl/sqlitelogictestccl/BUILD.bazel
@@ -1,18 +1,8 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "sqlitelogictestccl",
     srcs = ["doc.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/sqlitelogictestccl",
     visibility = ["//visibility:public"],
 )
-
-go_test(
-    name = "sqlitelogictestccl_test",
-    size = "small",
-    srcs = ["doc_test.go"],
-    data = [
-        "@com_github_cockroachdb_sqllogictest//:testfiles",
-    ],
-    embed = [":sqlitelogictestccl"],
-)
diff --git a/pkg/ccl/sqlitelogictestccl/doc_test.go b/pkg/ccl/sqlitelogictestccl/doc_test.go
diff --git a/pkg/cli/exit/BUILD.bazel b/pkg/cli/exit/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "exit",
@@ -11,10 +11,3 @@ go_library(
     visibility = ["//visibility:public"],
     deps = ["@com_github_cockroachdb_redact//:redact"],
 )
-
-go_test(
-    name = "exit_test",
-    size = "small",
-    srcs = ["codes_test.go"],
-    embed = [":exit"],
-)
diff --git a/pkg/cli/exit/codes_test.go b/pkg/cli/exit/codes_test.go
diff --git a/pkg/cmd/roachprod/cli/commands.go b/pkg/cmd/roachprod/cli/commands.go
@@ -689,7 +689,7 @@ The "status" command outputs the binary and PID for the specified nodes:
 			}
 			for _, status := range statuses {
 				if status.Err != nil {
-					config.Logger.Printf("  %2d: %s %s\n", status.NodeID, status.Err.Error())
+					config.Logger.Printf("  %2d: %s\n", status.NodeID, status.Err.Error())
 				} else if !status.Running {
 					// TODO(irfansharif): Surface the staged version here?
 					config.Logger.Printf("  %2d: not running\n", status.NodeID)
diff --git a/pkg/cmd/roachtest/tests/admission_control_multitenant_fairness.go b/pkg/cmd/roachtest/tests/admission_control_multitenant_fairness.go
@@ -344,7 +344,7 @@ func runMultiTenantFairness(
 	}
 
 	ok, maxLatencyDelta := floatsWithinPercentage(meanLatencies, failThreshold)
-	t.L().Printf("max-latency-delta=%d% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)
+	t.L().Printf("max-latency-delta=%d%% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)
 	if !ok {
 		// TODO(irfansharif): Same as above -- this is a weak assertion.
 		t.L().Printf("latency not within expectations: %f > %f %v", maxLatencyDelta, failThreshold, meanLatencies)
diff --git a/pkg/cmd/roachtest/tests/allocation_bench.go b/pkg/cmd/roachtest/tests/allocation_bench.go
@@ -331,9 +331,9 @@ func runAllocationBench(
 	}
 	samples := make([]*clusterstats.ClusterStatRun, spec.samples)
 
-	t.L().Printf("cpu(%) means: average of (max-min) node cpu utilization across intervals")
-	t.L().Printf("write(%) means: average of (max-min) write disk utilization across intervals")
-	t.L().Printf("cost(gb) means: GBs sent for rebalancing operations between initial and end")
+	t.L().Printf("%s", "cpu(%) means: average of (max-min) node cpu utilization across intervals")
+	t.L().Printf("%s", "write(%) means: average of (max-min) write disk utilization across intervals")
+	t.L().Printf("%s", "cost(gb) means: GBs sent for rebalancing operations between initial and end")
 
 	for i := 0; i < spec.samples; i++ {
 		statCollector, cleanupFunc := setupAllocationBench(ctx, t, c, spec)
diff --git a/pkg/cmd/roachtest/tests/backup_fixtures.go b/pkg/cmd/roachtest/tests/backup_fixtures.go
@@ -267,7 +267,7 @@ func (bd *backupDriver) runWorkload(ctx context.Context) (func(), error) {
 
 // scheduleBackups begins the backup schedule.
 func (bd *backupDriver) scheduleBackups(ctx context.Context) {
-	bd.t.L().Printf("creating backup schedule", bd.sp.fixture.WorkloadWarehouses)
+	bd.t.L().Printf("creating backup schedule %d", bd.sp.fixture.WorkloadWarehouses)
 	conn := bd.c.Conn(ctx, bd.t.L(), 1)
 	defer conn.Close()
 	if bd.sp.fixture.CompactionThreshold > 0 {
@@ -564,7 +564,7 @@ func GetFixtureRegistry(ctx context.Context, t test.Test, cloud spec.Cloud) *blo
 	case spec.GCE, spec.Local:
 		account, err := vm.Providers["gce"].FindActiveAccount(t.L())
 		require.NoError(t, err)
-		t.L().Printf("using GCE account", account)
+		t.L().Printf("using GCE account %s", account)
 
 		uri = url.URL{
 			Scheme:   "gs",
diff --git a/pkg/cmd/roachtest/tests/cluster_to_cluster.go b/pkg/cmd/roachtest/tests/cluster_to_cluster.go
@@ -919,7 +919,7 @@ func (rd *replicationDriver) onFingerprintMismatch(
 		endTime)
 	// Before failing on this error, back up the source and destination tenants.
 	if fingerprintBisectErr != nil {
-		rd.t.L().Printf("fingerprint bisect error", fingerprintBisectErr)
+		rd.t.L().Printf("fingerprint bisect error %+v", fingerprintBisectErr)
 	} else {
 		rd.t.L().Printf("table level fingerprints seem to match")
 	}
diff --git a/pkg/cmd/roachtest/tests/drain.go b/pkg/cmd/roachtest/tests/drain.go
@@ -222,7 +222,7 @@ func runEarlyExitInConnectionWait(ctx context.Context, t test.Test, c cluster.Cl
 	drainEndTimestamp := timeutil.Now()
 	actualDrainDuration := drainEndTimestamp.Sub(drainStartTimestamp)
 
-	t.L().Printf("the draining lasted %f seconds", actualDrainDuration)
+	t.L().Printf("the draining lasted %f seconds", actualDrainDuration.Seconds())
 
 	totalWaitDuration := drainWaitDuration + connectionWaitDuration + queryWaitDuration
 	if actualDrainDuration >= totalWaitDuration-10*time.Second {
diff --git a/pkg/cmd/roachtest/tests/gossip.go b/pkg/cmd/roachtest/tests/gossip.go
@@ -132,7 +132,7 @@ SELECT node_id
 
 				for i := range liveNodes {
 					if liveNodes[i] != expLiveNodes[i] {
-						t.L().Printf("%d: gossip not ok (mismatched view of live nodes); expected %s, got %s (%.0fs)\n",
+						t.L().Printf("%d: gossip not ok (mismatched view of live nodes); expected %+v, got %+v (%.0fs)\n",
 							i, expLiveNodes, liveNodes, timeutil.Since(start).Seconds())
 						return false
 					}
diff --git a/pkg/cmd/roachtest/tests/mixed_version_c2c.go b/pkg/cmd/roachtest/tests/mixed_version_c2c.go
@@ -520,7 +520,7 @@ func (cm *c2cMixed) WaitForReplicatedTime(
 		if !(replicatedTime.Valid && replicatedTime.Time.After(targetTime)) {
 			return errors.Newf("replicated time %s not yet at %s", replicatedTime, targetTime)
 		}
-		cm.t.L().Printf("replicated time is now %s, past %s", replicatedTime, targetTime)
+		cm.t.L().Printf("replicated time is now %+v, past %+v", replicatedTime, targetTime)
 		return nil
 	}, timeout)
 }
diff --git a/pkg/cmd/roachtest/tests/mixed_version_ldr.go b/pkg/cmd/roachtest/tests/mixed_version_ldr.go
@@ -459,9 +459,9 @@ func (lm *ldrMixed) WaitForReplicatedTime(
 			return err
 		}
 		if !(replicatedTime.Valid && replicatedTime.Time.After(targetTime)) {
-			return errors.Newf("replicated time %s not yet at %s", replicatedTime, targetTime)
+			return errors.Newf("replicated time %+v not yet at %s", replicatedTime, targetTime)
 		}
-		lm.t.L().Printf("replicated time is now %s, past %s", replicatedTime, targetTime)
+		lm.t.L().Printf("replicated time is now %+v, past %+v", replicatedTime, targetTime)
 
 		return nil
 	}, timeout)
diff --git a/pkg/cmd/roachtest/tests/network.go b/pkg/cmd/roachtest/tests/network.go
@@ -215,7 +215,7 @@ SELECT $1::INT = ALL (
 					"--url", url, "--certs-dir", certsDir, "-e", "'SELECT 1'")
 
 				// Report the results of execution.
-				t.L().Printf("server %d, attempt %d, result:\n%s\n", server, attempt, b)
+				t.L().Printf("server %d, attempt %d, result:\n%+v\n", server, attempt, b)
 				// Indicate, to the main goroutine, that we have at least one connection
 				// attempt completed.
 				atomic.AddUint32(&numConns, 1)
diff --git a/pkg/crosscluster/streamclient/uri_test.go b/pkg/crosscluster/streamclient/uri_test.go
@@ -60,7 +60,7 @@ func TestParseClusterUri(t *testing.T) {
 	for _, test := range tests {
 		uri, err := ParseClusterUri(test.uri)
 		if test.err != "" {
-			require.ErrorContains(t, err, test.err, "expected error parsing %s", test.uri)
+			require.ErrorContainsf(t, err, test.err, "expected error parsing %s", test.uri)
 		} else {
 			require.NoError(t, err)
 			require.Equal(t, uri.Serialize(), test.uri)
diff --git a/pkg/jobs/jobsprotectedts/BUILD.bazel b/pkg/jobs/jobsprotectedts/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "jobsprotectedts",
@@ -28,20 +28,3 @@ go_library(
         "@com_github_cockroachdb_errors//:errors",
     ],
 )
-
-go_test(
-    name = "jobsprotectedts_test",
-    size = "medium",
-    srcs = [
-        "jobs_protected_ts_test.go",
-        "main_test.go",
-    ],
-    deps = [
-        "//pkg/security/securityassets",
-        "//pkg/security/securitytest",
-        "//pkg/server",
-        "//pkg/testutils/serverutils",
-        "//pkg/testutils/testcluster",
-        "//pkg/util/randutil",
-    ],
-)
diff --git a/pkg/jobs/jobsprotectedts/jobs_protected_ts_test.go b/pkg/jobs/jobsprotectedts/jobs_protected_ts_test.go
diff --git a/pkg/jobs/jobsprotectedts/main_test.go b/pkg/jobs/jobsprotectedts/main_test.go
diff --git a/pkg/kv/kvserver/apply/asserter.go b/pkg/kv/kvserver/apply/asserter.go
@@ -172,7 +172,7 @@ func (r *rangeAsserter) propose(
 		//
 		// TODO(erikgrinaker): consider assertions around lease request replays.
 		if cmd.MaxLeaseIndex != 0 || cmd.ClosedTimestamp != nil {
-			fail("lease request proposal with LAI=%s CTS=%s", cmd.MaxLeaseIndex, cmd.ClosedTimestamp)
+			fail("lease request proposal with LAI=%d CTS=%s", cmd.MaxLeaseIndex, cmd.ClosedTimestamp)
 		}
 
 	} else {
diff --git a/pkg/roachprod/cloud/gc.go b/pkg/roachprod/cloud/gc.go
@@ -436,7 +436,7 @@ func GCClusters(l *logger.Logger, cloud *Cloud, dryrun bool) error {
 					// Dump json payload for debugging.
 					jsonBytes, err := json.Marshal(vm)
 					if err != nil {
-						l.Printf("Error encoding JSON:", err)
+						l.Printf("Error encoding JSON: %+v", err)
 					}
 					l.Printf(string(jsonBytes))
 
diff --git a/pkg/spanconfig/spanconfigreconciler/BUILD.bazel b/pkg/spanconfig/spanconfigreconciler/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "spanconfigreconciler",
@@ -27,9 +27,3 @@ go_library(
         "@com_github_cockroachdb_errors//:errors",
     ],
 )
-
-go_test(
-    name = "spanconfigreconciler_test",
-    srcs = ["reconciler_test.go"],
-    data = glob(["testdata/**"]),
-)
diff --git a/pkg/spanconfig/spanconfigreconciler/reconciler_test.go b/pkg/spanconfig/spanconfigreconciler/reconciler_test.go
diff --git a/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel b/pkg/spanconfig/spanconfigsqltranslator/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "spanconfigsqltranslator",
@@ -19,9 +19,3 @@ go_library(
         "@com_github_cockroachdb_errors//:errors",
     ],
 )
-
-go_test(
-    name = "spanconfigsqltranslator_test",
-    srcs = ["sqltranslator_test.go"],
-    data = glob(["testdata/**"]),
-)
diff --git a/pkg/spanconfig/spanconfigsqltranslator/sqltranslator_test.go b/pkg/spanconfig/spanconfigsqltranslator/sqltranslator_test.go
diff --git a/pkg/util/log/report.go b/pkg/util/log/report.go
diff --git a/pkg/workload/ycsb/BUILD.bazel b/pkg/workload/ycsb/BUILD.bazel
diff --git a/pkg/workload/ycsb/main_test.go b/pkg/workload/ycsb/main_test.go

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func gracefulClose(ctx context.Context, toClose io.ReadCloser) {`
`302`	`302`	`const respExtraReadLimit = 4096`
`303`	`303`	`_, _ = io.CopyN(io.Discard, toClose, respExtraReadLimit)`
`304`	`304`	`if err := toClose.Close(); err != nil {`
`305`		`- log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection", err)`
	`305`	`+ log.Changefeed.VInfof(ctx, 2, "failure to close schema registry connection: %+v", err)`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ The "status" command outputs the binary and PID for the specified nodes:`
`689`	`689`	`}`
`690`	`690`	`for _, status := range statuses {`
`691`	`691`	`if status.Err != nil {`
`692`		`- config.Logger.Printf(" %2d: %s %s\n", status.NodeID, status.Err.Error())`
	`692`	`+ config.Logger.Printf(" %2d: %s\n", status.NodeID, status.Err.Error())`
`693`	`693`	`} else if !status.Running {`
`694`	`694`	`// TODO(irfansharif): Surface the staged version here?`
`695`	`695`	`config.Logger.Printf(" %2d: not running\n", status.NodeID)`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ func runMultiTenantFairness(`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`ok, maxLatencyDelta := floatsWithinPercentage(meanLatencies, failThreshold)`
`347`		`- t.L().Printf("max-latency-delta=%d% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)`
	`347`	`+ t.L().Printf("max-latency-delta=%d%% mean-latency-per-tenant=%v\n", int(maxLatencyDelta*100), meanLatencies)`
`348`	`348`	`if !ok {`
`349`	`349`	`// TODO(irfansharif): Same as above -- this is a weak assertion.`
`350`	`350`	`t.L().Printf("latency not within expectations: %f > %f %v", maxLatencyDelta, failThreshold, meanLatencies)`