Skip to content

Commit 99e7c38

Browse files
craig[bot]yuzefovichRaduBerinderickystewart
committed
155564: *: remove remaining references of the meta issue for secondary test tenants r=yuzefovich a=yuzefovich **logictest: reference separate issue for disabling test tenant** **base: remove TODOTestTenantDisabled** All test tenant skips now have specific issues. ***: remove remaining references of the meta issue** Going forward, #76378 will be the meta issue tracking all remaining work for investigating and enabling test tenants across our tests. This commit removes the last explicit mentions of the issue by replacing with specific ones or enabling test tenants on some packages that happened to just work. Epic: CRDB-48945 Release note: None 156593: roachtest/pg_regress: accept recent diff and disable jobs notice r=yuzefovich a=yuzefovich Fixes: #155302. Release note: None 156952: go.mod: bump Pebble to 5c1580d5c101 r=RaduBerinde a=RaduBerinde Changes: * [`5c1580d5`](cockroachdb/pebble@5c1580d5) metrics: add compression counters * [`1bddddf4`](cockroachdb/pebble@1bddddf4) base: move cache.Level to base * [`97df4e11`](cockroachdb/pebble@97df4e11) db: compactions: calculate eventual output level * [`437775ad`](cockroachdb/pebble@437775ad) db: minor compaction cleanup * [`97bcce61`](cockroachdb/pebble@97bcce61) db: move replayIngestedFlushable into recovery.go * [`01889434`](cockroachdb/pebble@01889434) db: move replayWAL into recovery.go * [`d928a2e6`](cockroachdb/pebble@d928a2e6) db: pull more recovery logic into recoverState * [`eda4c4a4`](cockroachdb/pebble@eda4c4a4) sstable: in props, remove ValueSeparationKind, add ValueSeparationBySuffixDisabled * [`a3b6a96e`](cockroachdb/pebble@a3b6a96e) github: enable claude code review bot as an opt-in GH action * [`df7e1fc0`](cockroachdb/pebble@df7e1fc0) db, valsep: do not separate mvcc values if DisableSeparationBySuffix is true * [`1c9b3f39`](cockroachdb/pebble@1c9b3f39) db, valsep: make span ValueStoragePolicy a struct defining the min size * [`1df7d4aa`](cockroachdb/pebble@1df7d4aa) add CLAUDE.md * [`1113a6a2`](cockroachdb/pebble@1113a6a2) db: narrow down versionSet.metrics * [`8a7840b8`](cockroachdb/pebble@8a7840b8) deletepacer: don't use fifo.Queue * [`41b4919e`](cockroachdb/pebble@41b4919e) go.mod: require Go 1.25 Release note: none. Epic: none. 156967: bazci/githubpost: fix `pkg` calculation from `test.xml` r=rail a=rickystewart Since the `rules_go` upgrade from #156000, we have accidentally included the test name in the package path. This PR fixes that and fixes the associated test case. Release note: none Epic: none Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com> Co-authored-by: Radu Berinde <radu@cockroachlabs.com> Co-authored-by: Ricky Stewart <ricky@cockroachlabs.com>
5 parents d8af269 + 2fcfe80 + 1fe66d1 + e2bc73b + db3831a commit 99e7c38

File tree

98 files changed

+235
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+235
-280
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,10 @@ def go_deps():
18341834
patches = [
18351835
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18361836
],
1837-
sha256 = "0ffbfa9854e45c7fa775c37af3e80f439c078d28ffa348a6a2bdb9af4e10ad37",
1838-
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251102183433-951fae603dfe",
1837+
sha256 = "e0ee903c366abc160446c82a18d98cb1fc4d3c44bf21d2748844354fcc4c9424",
1838+
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251105164901-5c1580d5c101",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251102183433-951fae603dfe.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251105164901-5c1580d5c101.zip",
18411841
],
18421842
)
18431843
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ DISTDIR_FILES = {
352352
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
353353
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
354354
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
355-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251102183433-951fae603dfe.zip": "0ffbfa9854e45c7fa775c37af3e80f439c078d28ffa348a6a2bdb9af4e10ad37",
355+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251105164901-5c1580d5c101.zip": "e0ee903c366abc160446c82a18d98cb1fc4d3c44bf21d2748844354fcc4c9424",
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ require (
137137
github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f
138138
github.com/cockroachdb/gostdlib v1.19.0
139139
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
140-
github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe
140+
github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101
141141
github.com/cockroachdb/redact v1.1.6
142142
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
143143
github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
572572
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
573573
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
574574
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
575-
github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe h1:HUrVJv2RUIT2L9Gl4STK1rS0AvlubDvHgreuc3f+Boc=
576-
github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
575+
github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101 h1:k/gEqWA60iDwUdT3OgEIWirEUkI4ku/fxFfut7it6sg=
576+
github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101/go.mod h1:VCfKgAYZuLVBLitd8boLrNa0oE3OsnRaQauWXvFQWKc=
577577
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
578578
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
579579
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

‎pkg/backup/datadriven_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ func (d *datadrivenTestState) getSQLDBForVC(
344344
// - testingKnobCfg: specifies a key to a hardcoded testingKnob configuration
345345
//
346346
// - disable-tenant : ensures the test is never run in a multitenant environment by
347-
// setting testserverargs.DefaultTestTenant to base.TODOTestTenantDisabled.
347+
// setting testserverargs.DefaultTestTenant to
348+
// base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798).
348349
//
349350
// - "upgrade-cluster version=<version>"
350351
// Upgrade the cluster version of the active cluster to the passed in

‎pkg/base/test_server_args.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,6 @@ var (
379379
// to use TestTenantProbabilistic or TestTenantProbabilisticOnly.
380380
SharedTestTenantAlwaysEnabled = DefaultTestTenantOptions{testBehavior: ttEnabled | ttSharedProcess, allowAdditionalTenants: true}
381381

382-
// TODOTestTenantDisabled should not be used anymore. Use the
383-
// other values instead.
384-
// TODO(#76378): Review existing tests and use the proper value instead.
385-
TODOTestTenantDisabled = DefaultTestTenantOptions{testBehavior: ttDisabled, allowAdditionalTenants: true}
386-
387382
// TestRequiresExplicitSQLConnection is used when the test is unable to pass
388383
// the cluster as an option in the connection URL. The test could still
389384
// probabilistically use an external process test virtual cluster, but

‎pkg/bench/rttanalysis/bench_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestMain(m *testing.M) {
2525
serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
2626

2727
defer serverutils.TestingSetDefaultTenantSelectionOverride(
28-
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
28+
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(83461),
2929
)()
3030

3131
os.Exit(m.Run())

‎pkg/bench/tpcc/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestMain(m *testing.M) {
2323
serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
2424

2525
defer serverutils.TestingSetDefaultTenantSelectionOverride(
26-
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
26+
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(83461),
2727
)()
2828

2929
os.Exit(m.Run())

‎pkg/ccl/changefeedccl/tableset/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
2626
serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
2727

2828
defer serverutils.TestingSetDefaultTenantSelectionOverride(
29-
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
29+
base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(142799),
3030
)()
3131

3232
os.Exit(m.Run())

‎pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)