Skip to content

Commit ab5f159

Browse files
craig[bot]jbowensrafiss
committed
149091: go.mod: bump Pebble to c40280e0c860 r=annrpom a=jbowens Changes: * [`c40280e0`](cockroachdb/pebble@c40280e0) db: don't ref version until blob rewrite compaction is scheduled * [`6ac23ffb`](cockroachdb/pebble@6ac23ffb) pebble: prefer L0->Lbase move compactions when possible * [`e5fcf2f0`](cockroachdb/pebble@e5fcf2f0) db: fix delete-only compaction event log * [`dff3eec3`](cockroachdb/pebble@dff3eec3) pebble: account for blobFileRewriteCompaction in compaction metrics * [`b6e27cd7`](cockroachdb/pebble@b6e27cd7) pebble: remove unused param in incrementCompactions fn * [`209a45f0`](cockroachdb/pebble@209a45f0) tool: add support for inspecting sstable's blob value liveness index * [`243cff44`](cockroachdb/pebble@243cff44) db: add TestBlobRewriteRandomized * [`28a5f111`](cockroachdb/pebble@28a5f111) blob: fix ValueFetcher value index lookup * [`6fcadae9`](cockroachdb/pebble@6fcadae9) db: fix blob file rewrite bug * [`65f3f9b1`](cockroachdb/pebble@65f3f9b1) blob: uncouple blob file rewriting logic * [`3a1173a2`](cockroachdb/pebble@3a1173a2) blob: handle sparseness in AddVirtualBlockMapping Release note: none. Epic: none. 149099: schemachanger: attempt to deflake schemachanger integration tests r=rafiss a=rafiss We are seeing more timeouts in the tests. This patch attempts to deflake the test by forcing production values for constants and settings, rather than using metamorphic settings. It also skips more tests under deadlock, which were already skipped under race. informs #148902 informs #148901 informs #148901 Release note: None Co-authored-by: Jackson Owens <[email protected]> Co-authored-by: Rafi Shamim <[email protected]>
3 parents 27417f3 + 5b01133 + 2d34092 commit ab5f159

File tree

11 files changed

+23
-7
lines changed

11 files changed

+23
-7
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,10 +1835,10 @@ def go_deps():
18351835
patches = [
18361836
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18371837
],
1838-
sha256 = "1353b00f3f9d7c1bc162758166a36c34ba004e06e491cb0144afeb806920b420",
1839-
strip_prefix = "github.com/cockroachdb/[email protected]20250625190909-6d965cb08562",
1838+
sha256 = "05c54b72d105a3bfa4a7dd5739be84d72596df37022c6c6df577b59650f87203",
1839+
strip_prefix = "github.com/cockroachdb/[email protected]20250627191025-c40280e0c860",
18401840
urls = [
1841-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250625190909-6d965cb08562.zip",
1841+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250627191025-c40280e0c860.zip",
18421842
],
18431843
)
18441844
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ DISTDIR_FILES = {
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
359359
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
360-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250625190909-6d965cb08562.zip": "1353b00f3f9d7c1bc162758166a36c34ba004e06e491cb0144afeb806920b420",
360+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250627191025-c40280e0c860.zip": "05c54b72d105a3bfa4a7dd5739be84d72596df37022c6c6df577b59650f87203",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
363363
"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
@@ -139,7 +139,7 @@ require (
139139
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
140140
github.com/cockroachdb/gostdlib v1.19.0
141141
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
142-
github.com/cockroachdb/pebble v0.0.0-20250625190909-6d965cb08562
142+
github.com/cockroachdb/pebble v0.0.0-20250627191025-c40280e0c860
143143
github.com/cockroachdb/redact v1.1.6
144144
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
145145
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
580580
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
581581
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
582582
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
583-
github.com/cockroachdb/pebble v0.0.0-20250625190909-6d965cb08562 h1:jUwqcNvk5SEcg1jUxu/Qmx8MEsVRM/BejR6KRxOJIJ8=
584-
github.com/cockroachdb/pebble v0.0.0-20250625190909-6d965cb08562/go.mod h1:+E2g3dO+px5IVuHgq5o+O5iy7fRK2eJLdckgrbtWzeE=
583+
github.com/cockroachdb/pebble v0.0.0-20250627191025-c40280e0c860 h1:KW5Jo6irucGRYI3i6ZShw64tIK9japdTHu9KumyQDEw=
584+
github.com/cockroachdb/pebble v0.0.0-20250627191025-c40280e0c860/go.mod h1:+E2g3dO+px5IVuHgq5o+O5iy7fRK2eJLdckgrbtWzeE=
585585
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
586586
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
587587
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/ccl/schemachangerccl/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ go_library(
2020
"//pkg/sql",
2121
"//pkg/sql/schemachanger/scexec",
2222
"//pkg/sql/schemachanger/sctest",
23+
"//pkg/sql/sem/eval",
2324
"//pkg/testutils/serverutils",
2425
],
2526
)

‎pkg/ccl/schemachangerccl/multiregion_testcluster_factory.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/cockroachdb/cockroach/pkg/sql"
2020
"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scexec"
2121
"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/sctest"
22+
"github.com/cockroachdb/cockroach/pkg/sql/sem/eval"
2223
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
2324
)
2425

@@ -61,6 +62,9 @@ func (f MultiRegionTestClusterFactory) Run(
6162
) {
6263
const numServers = 3
6364
knobs := base.TestingKnobs{
65+
SQLEvalContext: &eval.TestingKnobs{
66+
ForceProductionValues: true,
67+
},
6468
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
6569
SQLExecutor: &sql.ExecutorTestingKnobs{
6670
UseTransactionalDescIDGenerator: true,

‎pkg/sql/schemachanger/sctest/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ go_library(
4343
"//pkg/sql/schemachanger/scplan/scviz",
4444
"//pkg/sql/schemachanger/screl",
4545
"//pkg/sql/schemachanger/scrun",
46+
"//pkg/sql/sem/eval",
4647
"//pkg/sql/sem/tree",
4748
"//pkg/sql/sessiondata",
4849
"//pkg/sql/sessiondatapb",

‎pkg/sql/schemachanger/sctest/cumulative.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func Rollback(t *testing.T, relPath string, factory TestServerFactory) {
3636
// These tests are expensive.
3737
skip.UnderStress(t)
3838
skip.UnderRace(t)
39+
skip.UnderDeadlock(t)
3940

4041
testRollbackCase := func(t *testing.T, cs CumulativeTestCaseSpec) {
4142
if cs.Phase != scop.PostCommitPhase {
@@ -282,6 +283,7 @@ func GenerateSchemaChangeCorpus(t *testing.T, path string, factory TestServerFac
282283
// These tests are expensive.
283284
skip.UnderStress(t)
284285
skip.UnderRace(t)
286+
skip.UnderDeadlock(t)
285287

286288
if corpusPath == "" {
287289
skip.IgnoreLintf(t, "requires declarative-corpus path parameter")
@@ -329,6 +331,7 @@ func Pause(t *testing.T, path string, factory TestServerFactory) {
329331
// These tests are expensive.
330332
skip.UnderStress(t)
331333
skip.UnderRace(t)
334+
skip.UnderDeadlock(t)
332335

333336
cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) {
334337
pause(t, factory, cs)
@@ -341,6 +344,7 @@ func PauseMixedVersion(t *testing.T, path string, factory TestServerFactory) {
341344
// These tests are expensive.
342345
skip.UnderStress(t)
343346
skip.UnderRace(t)
347+
skip.UnderDeadlock(t)
344348

345349
factory.WithMixedVersion()
346350
cumulativeTestForEachPostCommitStage(t, path, factory, func(t *testing.T, cs CumulativeTestCaseSpec) {

‎pkg/sql/schemachanger/sctest/decomp.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func DecomposeToElements(t *testing.T, dir string, factory TestServerFactory) {
3636
// These tests are expensive.
3737
skip.UnderRace(t)
3838
skip.UnderStress(t)
39+
skip.UnderDeadlock(t)
3940

4041
ctx := context.Background()
4142
datadriven.Walk(t, dir, func(t *testing.T, path string) {

‎pkg/sql/schemachanger/sctest/end_to_end.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func EndToEndSideEffects(t *testing.T, relTestCaseDir string, factory TestServer
5858
// These tests are expensive.
5959
skip.UnderStress(t)
6060
skip.UnderRace(t)
61+
skip.UnderDeadlock(t)
6162

6263
ctx := context.Background()
6364
testCaseDir := datapathutils.RewritableDataPath(t, relTestCaseDir)

0 commit comments

Comments
 (0)