From e57e2785b4abc220089b5e275b44608f03b5cb67 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Fri, 25 Feb 2022 16:35:00 -0600 Subject: [PATCH] bazel: use test sharding more liberally Closes #76376. Release note: None Release justification: non-production code changes --- pkg/bench/rttanalysis/BUILD.bazel | 1 + pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel | 1 + pkg/ccl/kvccl/kvtenantccl/BUILD.bazel | 1 + pkg/ccl/schemachangerccl/BUILD.bazel | 1 + pkg/ccl/telemetryccl/BUILD.bazel | 1 + pkg/ccl/testccl/sqlccl/BUILD.bazel | 1 + pkg/ccl/workloadccl/allccl/BUILD.bazel | 1 + pkg/cli/democluster/BUILD.bazel | 1 + pkg/jobs/BUILD.bazel | 1 + pkg/kv/BUILD.bazel | 1 + pkg/kv/kvclient/kvcoord/BUILD.bazel | 1 + pkg/kv/kvserver/BUILD.bazel | 4 ++-- pkg/kv/kvserver/concurrency/BUILD.bazel | 1 + pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel | 1 + pkg/kv/kvserver/spanlatch/BUILD.bazel | 1 + pkg/migration/migrations/BUILD.bazel | 1 + pkg/sql/colexec/BUILD.bazel | 1 + pkg/sql/opt/exec/execbuilder/BUILD.bazel | 1 + pkg/sql/pgwire/BUILD.bazel | 1 + pkg/sql/physicalplan/BUILD.bazel | 1 + pkg/sql/schemachanger/BUILD.bazel | 1 + pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel | 1 + pkg/sql/tests/BUILD.bazel | 1 + pkg/storage/metamorphic/BUILD.bazel | 1 + pkg/util/interval/generic/BUILD.bazel | 1 + pkg/workload/ycsb/BUILD.bazel | 1 + 26 files changed, 27 insertions(+), 2 deletions(-) diff --git a/pkg/bench/rttanalysis/BUILD.bazel b/pkg/bench/rttanalysis/BUILD.bazel index db98f19200b9..797bdf94d057 100644 --- a/pkg/bench/rttanalysis/BUILD.bazel +++ b/pkg/bench/rttanalysis/BUILD.bazel @@ -49,6 +49,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":rttanalysis"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/security", diff --git a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel index a7a0b17dc9c2..d502e4325766 100644 --- a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel +++ b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel @@ -8,6 +8,7 @@ go_test( "multi_region_bench_test.go", ], data = glob(["testdata/**"]), + shard_count = 16, deps = [ "//pkg/base", "//pkg/bench/rttanalysis", diff --git a/pkg/ccl/kvccl/kvtenantccl/BUILD.bazel b/pkg/ccl/kvccl/kvtenantccl/BUILD.bazel index 16ec8993c2b6..5bbdbcf8aa21 100644 --- a/pkg/ccl/kvccl/kvtenantccl/BUILD.bazel +++ b/pkg/ccl/kvccl/kvtenantccl/BUILD.bazel @@ -48,6 +48,7 @@ go_test( "tenant_upgrade_test.go", ], embed = [":kvtenantccl"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/ccl/utilccl", diff --git a/pkg/ccl/schemachangerccl/BUILD.bazel b/pkg/ccl/schemachangerccl/BUILD.bazel index 956253970d3f..bd5a4da60889 100644 --- a/pkg/ccl/schemachangerccl/BUILD.bazel +++ b/pkg/ccl/schemachangerccl/BUILD.bazel @@ -11,6 +11,7 @@ go_test( "//pkg/sql/schemachanger:testdata", ], embed = [":schemachangerccl"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/build/bazel", diff --git a/pkg/ccl/telemetryccl/BUILD.bazel b/pkg/ccl/telemetryccl/BUILD.bazel index 9c1ba639f4d1..4ef6c408dbef 100644 --- a/pkg/ccl/telemetryccl/BUILD.bazel +++ b/pkg/ccl/telemetryccl/BUILD.bazel @@ -7,6 +7,7 @@ go_test( "telemetry_test.go", ], data = glob(["testdata/**"]), + shard_count = 16, deps = [ "//pkg/base", "//pkg/ccl", diff --git a/pkg/ccl/testccl/sqlccl/BUILD.bazel b/pkg/ccl/testccl/sqlccl/BUILD.bazel index a75377363cb4..dff0d06c762c 100644 --- a/pkg/ccl/testccl/sqlccl/BUILD.bazel +++ b/pkg/ccl/testccl/sqlccl/BUILD.bazel @@ -9,6 +9,7 @@ go_test( "show_transfer_state_test.go", "temp_table_clean_test.go", ], + shard_count = 16, deps = [ "//pkg/base", "//pkg/ccl/kvccl/kvtenantccl", diff --git a/pkg/ccl/workloadccl/allccl/BUILD.bazel b/pkg/ccl/workloadccl/allccl/BUILD.bazel index a2a29ed991a8..7e9d849184ee 100644 --- a/pkg/ccl/workloadccl/allccl/BUILD.bazel +++ b/pkg/ccl/workloadccl/allccl/BUILD.bazel @@ -40,6 +40,7 @@ go_test( "main_test.go", ], embed = [":allccl"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/ccl", diff --git a/pkg/cli/democluster/BUILD.bazel b/pkg/cli/democluster/BUILD.bazel index 6877ca2cacc6..d4fe734e33a6 100644 --- a/pkg/cli/democluster/BUILD.bazel +++ b/pkg/cli/democluster/BUILD.bazel @@ -54,6 +54,7 @@ go_test( name = "democluster_test", srcs = ["demo_cluster_test.go"], embed = [":democluster"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/ccl/kvccl/kvtenantccl", diff --git a/pkg/jobs/BUILD.bazel b/pkg/jobs/BUILD.bazel index 040ae7af447b..d25942ec95ec 100644 --- a/pkg/jobs/BUILD.bazel +++ b/pkg/jobs/BUILD.bazel @@ -89,6 +89,7 @@ go_test( "testutils_test.go", ], embed = [":jobs"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/clusterversion", diff --git a/pkg/kv/BUILD.bazel b/pkg/kv/BUILD.bazel index 337b13521ffa..12eaaf6ffa00 100644 --- a/pkg/kv/BUILD.bazel +++ b/pkg/kv/BUILD.bazel @@ -56,6 +56,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":kv"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/config/zonepb", diff --git a/pkg/kv/kvclient/kvcoord/BUILD.bazel b/pkg/kv/kvclient/kvcoord/BUILD.bazel index 3f22e3713ea6..817e23cca339 100644 --- a/pkg/kv/kvclient/kvcoord/BUILD.bazel +++ b/pkg/kv/kvclient/kvcoord/BUILD.bazel @@ -134,6 +134,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":kvcoord"], + shard_count = 16, tags = ["no-remote"], deps = [ "//build/bazelutil:noop", diff --git a/pkg/kv/kvserver/BUILD.bazel b/pkg/kv/kvserver/BUILD.bazel index e24b2673dcf9..1f3ed277bd40 100644 --- a/pkg/kv/kvserver/BUILD.bazel +++ b/pkg/kv/kvserver/BUILD.bazel @@ -307,8 +307,8 @@ go_test( ], data = glob(["testdata/**"]), embed = [":kvserver"], - shard_count = 4, - tags = ["cpu:4"], + shard_count = 8, + tags = ["cpu:2"], deps = [ "//pkg/base", "//pkg/cli/exit", diff --git a/pkg/kv/kvserver/concurrency/BUILD.bazel b/pkg/kv/kvserver/concurrency/BUILD.bazel index 4e28adfbb895..e04102993536 100644 --- a/pkg/kv/kvserver/concurrency/BUILD.bazel +++ b/pkg/kv/kvserver/concurrency/BUILD.bazel @@ -51,6 +51,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":concurrency"], + shard_count = 16, deps = [ "//pkg/kv/kvserver/batcheval", "//pkg/kv/kvserver/concurrency/lock", diff --git a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel index f94955048aa5..1879f9fa65dd 100644 --- a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel +++ b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel @@ -39,6 +39,7 @@ go_test( "validate_test.go", ], embed = [":ptstorage"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/keys", diff --git a/pkg/kv/kvserver/spanlatch/BUILD.bazel b/pkg/kv/kvserver/spanlatch/BUILD.bazel index da2b43c4130d..6d8fa74d795f 100644 --- a/pkg/kv/kvserver/spanlatch/BUILD.bazel +++ b/pkg/kv/kvserver/spanlatch/BUILD.bazel @@ -35,6 +35,7 @@ go_test( ":latch_interval_btree_test.go", # keep ], embed = [":spanlatch"], + shard_count = 16, deps = [ "//pkg/keys", "//pkg/kv/kvserver/spanset", diff --git a/pkg/migration/migrations/BUILD.bazel b/pkg/migration/migrations/BUILD.bazel index 4df93c0ab58f..af4fc9583d07 100644 --- a/pkg/migration/migrations/BUILD.bazel +++ b/pkg/migration/migrations/BUILD.bazel @@ -78,6 +78,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":migrations"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/clusterversion", diff --git a/pkg/sql/colexec/BUILD.bazel b/pkg/sql/colexec/BUILD.bazel index 9c2d0f7f9e19..6e3b414ceb7b 100644 --- a/pkg/sql/colexec/BUILD.bazel +++ b/pkg/sql/colexec/BUILD.bazel @@ -132,6 +132,7 @@ go_test( "values_test.go", ], embed = [":colexec"], + shard_count = 16, deps = [ "//pkg/col/coldata", "//pkg/col/coldataext", diff --git a/pkg/sql/opt/exec/execbuilder/BUILD.bazel b/pkg/sql/opt/exec/execbuilder/BUILD.bazel index 1598212e5e37..bbe303bcdfc1 100644 --- a/pkg/sql/opt/exec/execbuilder/BUILD.bazel +++ b/pkg/sql/opt/exec/execbuilder/BUILD.bazel @@ -64,6 +64,7 @@ go_test( "@cockroach//c-deps:libgeos", ], embed = [":execbuilder"], + shard_count = 16, deps = [ "//pkg/security", "//pkg/security/securitytest", diff --git a/pkg/sql/pgwire/BUILD.bazel b/pkg/sql/pgwire/BUILD.bazel index 13034e217132..3cc32f8e0a91 100644 --- a/pkg/sql/pgwire/BUILD.bazel +++ b/pkg/sql/pgwire/BUILD.bazel @@ -94,6 +94,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":pgwire"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/cloud/impl:cloudimpl", diff --git a/pkg/sql/physicalplan/BUILD.bazel b/pkg/sql/physicalplan/BUILD.bazel index aaec8e7cdd6e..b165871220a3 100644 --- a/pkg/sql/physicalplan/BUILD.bazel +++ b/pkg/sql/physicalplan/BUILD.bazel @@ -46,6 +46,7 @@ go_test( "span_resolver_test.go", ], embed = [":physicalplan"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/gossip", diff --git a/pkg/sql/schemachanger/BUILD.bazel b/pkg/sql/schemachanger/BUILD.bazel index 34d54fedeafc..14f550b1ec31 100644 --- a/pkg/sql/schemachanger/BUILD.bazel +++ b/pkg/sql/schemachanger/BUILD.bazel @@ -15,6 +15,7 @@ go_test( "schemachanger_test.go", ], data = [":testdata"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/jobs", diff --git a/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel b/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel index 36611401b611..561093892daf 100644 --- a/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel +++ b/pkg/sql/sqlstats/persistedsqlstats/BUILD.bazel @@ -63,6 +63,7 @@ go_test( "scheduled_sql_stats_compaction_test.go", ], data = glob(["testdata/**"]), + shard_count = 16, deps = [ ":persistedsqlstats", "//pkg/base", diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel index 635c76393aaa..59394af7724f 100644 --- a/pkg/sql/tests/BUILD.bazel +++ b/pkg/sql/tests/BUILD.bazel @@ -51,6 +51,7 @@ go_test( ], data = glob(["testdata/**"]), embed = [":tests"], + shard_count = 16, deps = [ "//pkg/base", "//pkg/bench", diff --git a/pkg/storage/metamorphic/BUILD.bazel b/pkg/storage/metamorphic/BUILD.bazel index 2fac2c08a204..1216400ee21d 100644 --- a/pkg/storage/metamorphic/BUILD.bazel +++ b/pkg/storage/metamorphic/BUILD.bazel @@ -36,6 +36,7 @@ go_test( "meta_test.go", ], embed = [":metamorphic"], + shard_count = 16, deps = [ "//pkg/settings/cluster", "//pkg/testutils", diff --git a/pkg/util/interval/generic/BUILD.bazel b/pkg/util/interval/generic/BUILD.bazel index 782573d9b0ac..c5f9817733a3 100644 --- a/pkg/util/interval/generic/BUILD.bazel +++ b/pkg/util/interval/generic/BUILD.bazel @@ -21,6 +21,7 @@ go_test( size = "large", srcs = [":example_interval_btree_test.go"], embed = [":generic"], + shard_count = 16, deps = [ "//pkg/keys", "//pkg/roachpb", diff --git a/pkg/workload/ycsb/BUILD.bazel b/pkg/workload/ycsb/BUILD.bazel index 97ac448254f5..60bf96d42eb7 100644 --- a/pkg/workload/ycsb/BUILD.bazel +++ b/pkg/workload/ycsb/BUILD.bazel @@ -34,6 +34,7 @@ go_test( "zipfgenerator_test.go", ], embed = [":ycsb"], + shard_count = 16, deps = [ "//pkg/testutils/skip", "//pkg/util/leaktest",