Skip to content

Commit dd2376a

Browse files
craig[bot]RaduBerinde
craig[bot]
and
RaduBerinde
committed
Merge #147939
147939: go.mod: bump Pebble to 1f0f159d4671 r=RaduBerinde a=RaduBerinde Changes: * [`1f0f159d`](cockroachdb/pebble@1f0f159d) options: fix missing case in WAL recovery dir check * [`a266829e`](cockroachdb/pebble@a266829e) tool: refactor blob file mappings * [`7cd1b7ed`](cockroachdb/pebble@7cd1b7ed) metamorphic: show op name on parsing panics * [`e4607945`](cockroachdb/pebble@e4607945) open: remove version check for shared objects * [`8ab4b153`](cockroachdb/pebble@8ab4b153) db: fix obsolete file metric underflows * [`38254300`](cockroachdb/pebble@38254300) tool: remove empty version edit checking in `manifest check` command * [`cc5a0f5f`](cockroachdb/pebble@cc5a0f5f) manifest: include blob files in Version debug string * [`11f559f8`](cockroachdb/pebble@11f559f8) tool: use VersionEdit.DebugString in manifest dump * [`b10c0e87`](cockroachdb/pebble@b10c0e87) manifest: validate BlobReferences and BlobFileSet agree * [`efc47891`](cockroachdb/pebble@efc47891) manifest: rework blob file reference counting * [`c62e07bd`](cockroachdb/pebble@c62e07bd) manifest: add btree.All * [`8dc3fcec`](cockroachdb/pebble@8dc3fcec) manifest: genericize btree iterator * [`df4fc02c`](cockroachdb/pebble@df4fc02c) github: fix issue titles * [`dea395a7`](cockroachdb/pebble@dea395a7) github: fix post-issue * [`1b262df9`](cockroachdb/pebble@1b262df9) db: consistently use obsoleteFile struct * [`b99e8bed`](cockroachdb/pebble@b99e8bed) block: introduce CompressionProfile * [`a2a88039`](cockroachdb/pebble@a2a88039) db: avoid provider lookup when pacing file deletions * [`12c215c4`](cockroachdb/pebble@12c215c4) sstable: store compressor in layoutWriter * [`1985e8dc`](cockroachdb/pebble@1985e8dc) block: pass compressor as pointer * [`9db6dee6`](cockroachdb/pebble@9db6dee6) block: rename GetCompressor to MakeCompressor * [`703ca0dd`](cockroachdb/pebble@703ca0dd) pebble: delete redundant l0 case in pickAutoLPositive * [`6d0d3c1d`](cockroachdb/pebble@6d0d3c1d) block: introduce blockkinds Release note: none. Epic: none. Co-authored-by: Radu Berinde <[email protected]>
2 parents 44f6c3d + e3546b3 commit dd2376a

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,10 +1885,10 @@ def go_deps():
18851885
patches = [
18861886
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18871887
],
1888-
sha256 = "4d8efa8c0a303a240ef6ca42d72ad892a006a5cdb9897cda723cfd64a5959b77",
1889-
strip_prefix = "github.com/cockroachdb/[email protected]20250603182808-a1bc6420d3c6",
1888+
sha256 = "f2d23b2843a639e87910bfa009913af4553cd1004f8b014dd65d0ed23690ab1f",
1889+
strip_prefix = "github.com/cockroachdb/[email protected]20250607002512-1f0f159d4671",
18901890
urls = [
1891-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250603182808-a1bc6420d3c6.zip",
1891+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250607002512-1f0f159d4671.zip",
18921892
],
18931893
)
18941894
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ DISTDIR_FILES = {
366366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
367367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
368368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
369-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250603182808-a1bc6420d3c6.zip": "4d8efa8c0a303a240ef6ca42d72ad892a006a5cdb9897cda723cfd64a5959b77",
369+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250607002512-1f0f159d4671.zip": "f2d23b2843a639e87910bfa009913af4553cd1004f8b014dd65d0ed23690ab1f",
370370
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
371371
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
372372
"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-20250603182808-a1bc6420d3c6
142+
github.com/cockroachdb/pebble v0.0.0-20250607002512-1f0f159d4671
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
@@ -597,8 +597,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
597597
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
598598
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
599599
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
600-
github.com/cockroachdb/pebble v0.0.0-20250603182808-a1bc6420d3c6 h1:wb1UXjaUwwF7HatmYxzfXJVGzJCMMDUz0lBtIrm2XqE=
601-
github.com/cockroachdb/pebble v0.0.0-20250603182808-a1bc6420d3c6/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
600+
github.com/cockroachdb/pebble v0.0.0-20250607002512-1f0f159d4671 h1:wdLk4pQoCKsCHDoAWuuiYomB1CKwF9Nd9Uiga7Xz04M=
601+
github.com/cockroachdb/pebble v0.0.0-20250607002512-1f0f159d4671/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
602602
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
603603
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
604604
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/storage/testdata/wal_failover_config‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ UnhealthyOperationLatencyThreshold() = (100ms,true)
4747

4848
open flag= envs=(foo,bar) open=foo
4949
----
50-
open error: directory "bar/auxiliary/wals-among-stores" may contain relevant WALs
51-
OPTIONS key: WAL Failover.secondary_dir
50+
open error: directory "bar/auxiliary/wals-among-stores" may contain relevant WALs but is not in WALRecoveryDirs
51+
WALFailover.Secondary changed from previous options
52+
o.WALDir: ""
53+
o.WALRecoveryDirs: 0
5254

5355
# Opening with the "disabled" setting should succeed.
5456

@@ -109,25 +111,31 @@ UnhealthyOperationLatencyThreshold() = (100ms,true)
109111

110112
open flag= envs=(foo) open=foo
111113
----
112-
open error: directory "bax" may contain relevant WALs
113-
OPTIONS key: WAL Failover.secondary_dir
114+
open error: directory "bax" may contain relevant WALs but is not in WALRecoveryDirs
115+
WALFailover.Secondary changed from previous options
116+
o.WALDir: ""
117+
o.WALRecoveryDirs: 0
114118

115119
# Try to disable it without setting a prev_path. It should fail
116120
# as well.
117121

118122
open flag=disabled envs=(foo) open=foo
119123
----
120-
open error: directory "bax" may contain relevant WALs
121-
OPTIONS key: WAL Failover.secondary_dir
124+
open error: directory "bax" may contain relevant WALs but is not in WALRecoveryDirs
125+
WALFailover.Secondary changed from previous options
126+
o.WALDir: ""
127+
o.WALRecoveryDirs: 0
122128

123129
# Changing the secondary location without specifying prev_path=bax
124130
# should fail.
125131

126132
open flag=path=baz envs=(foo) open=foo
127133
----
128-
open error: directory "bax" may contain relevant WALs
129-
OPTIONS key: WAL Failover.secondary_dir
130-
o.WALFailover.Secondary.Dirname: baz
134+
open error: directory "bax" may contain relevant WALs but is not in WALRecoveryDirs
135+
WALFailover.Secondary changed from previous options
136+
o.WALDir: ""
137+
o.WALFailover.Secondary.Dirname: "baz"
138+
o.WALRecoveryDirs: 0
131139

132140
# Changing the secondary location WITH specifying prev_path=bax
133141
# should succeed.

0 commit comments

Comments
 (0)