From fd36e4d4d96748ca385b09741d17acd43fce5958 Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Fri, 12 Apr 2024 18:00:36 -0700 Subject: [PATCH 1/2] go.mod: bump Pebble to 6a4bcf5f1aec Changes: * [`6a4bcf5f`](https://github.com/cockroachdb/pebble/commit/6a4bcf5f) db: check for empty external ingestions * [`1eab9d61`](https://github.com/cockroachdb/pebble/commit/1eab9d61) db: simplify levelIter skipEmptyFileForward * [`e7662630`](https://github.com/cockroachdb/pebble/commit/e7662630) db: refactor Reader.Get * [`cf40ae78`](https://github.com/cockroachdb/pebble/commit/cf40ae78) metamorphic: don't set synthetic suffix if there are duplicate prefixes Release note: none. Epic: none. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index bc6c69b91ab3..3c7d755dcf5b 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1683,10 +1683,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "67130f354fa38ef229503f8872696a5f2534636e5419f48e8ae04808565f9fce", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240412140635-26032dc0f80b", + sha256 = "8cca4abbe3e4d4c758c27e500e2c4bc33d92343e97985f1b815d262283f1df64", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240412230519-6a4bcf5f1aec", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240412140635-26032dc0f80b.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240412230519-6a4bcf5f1aec.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 55e81729156e..54e7f765fe85 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -329,7 +329,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240412140635-26032dc0f80b.zip": "67130f354fa38ef229503f8872696a5f2534636e5419f48e8ae04808565f9fce", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240412230519-6a4bcf5f1aec.zip": "8cca4abbe3e4d4c758c27e500e2c4bc33d92343e97985f1b815d262283f1df64", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1", diff --git a/go.mod b/go.mod index ee7a4a635c98..817ee34c6a02 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 github.com/cockroachdb/gostdlib v1.19.0 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b - github.com/cockroachdb/pebble v0.0.0-20240412140635-26032dc0f80b + github.com/cockroachdb/pebble v0.0.0-20240412230519-6a4bcf5f1aec github.com/cockroachdb/redact v1.1.5 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b diff --git a/go.sum b/go.sum index 743f2dde120f..ca5bea700c06 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA= -github.com/cockroachdb/pebble v0.0.0-20240412140635-26032dc0f80b h1:Uw1oKQzeOIVtuIemNTH1RMGTfEzJzFQBQqBdtHYYTN8= -github.com/cockroachdb/pebble v0.0.0-20240412140635-26032dc0f80b/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU= +github.com/cockroachdb/pebble v0.0.0-20240412230519-6a4bcf5f1aec h1:xa7OLCGcVrm9i6gHBwTtWpp0qOGetIi+DcZszyYO8IM= +github.com/cockroachdb/pebble v0.0.0-20240412230519-6a4bcf5f1aec/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= From baa68a3650f54de03cb0a077762259a9cd60f2db Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Fri, 12 Apr 2024 18:05:28 -0700 Subject: [PATCH 2/2] storage: check external ingestions in test mode Informs #122176 --- pkg/storage/pebble.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index 421f1670e792..1433b21ef1c9 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -1092,6 +1092,10 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) { } } + if buildutil.CrdbTestBuild { + cfg.opts.Experimental.CheckExternalIngestions = true + } + cfg.opts.EnsureDefaults() // The context dance here is done so that we have a clean context without