Skip to content

Commit 97071d2

Browse files
jbowensjbowens
committed
go.mod: bump Pebble to e8d7ecb38559
Changes: * [`e8d7ecb3`](cockroachdb/pebble@e8d7ecb3) db: tolerate unknown options * [`75afc702`](cockroachdb/pebble@75afc702) vfs: log GetDiskUsage calls in loggingFS * [`459c8ae8`](cockroachdb/pebble@459c8ae8) db: scan and filter WALs during recovery * [`91dfeada`](cockroachdb/pebble@91dfeada) db: move locking of WAL recovery directories * [`15d065ba`](cockroachdb/pebble@15d065ba) db: fix RangeDeletionBytesEstimate * [`c26a7b21`](cockroachdb/pebble@c26a7b21) db: add RangeDeletionBytesEstimate blob file test * [`580eb1a8`](cockroachdb/pebble@580eb1a8) db,valsep: move valsep tests to appropriate pkg Release note: none. Epic: none.
1 parent 53ccb25 commit 97071d2

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
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 = "a8e7a07f6fec624733ef5497d2fbe77635ce19f7ed21cc12c4af516fa507e34a",
1838-
strip_prefix = "github.com/cockroachdb/[email protected]20251025151421-4cb1291805fb",
1837+
sha256 = "9b2a84419f999a1a0b37fccb761dca75dd2cd2ec4fd4875dbe900c9d14e12b79",
1838+
strip_prefix = "github.com/cockroachdb/[email protected]20251029205532-e8d7ecb38559",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251025151421-4cb1291805fb.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251029205532-e8d7ecb38559.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-20251025151421-4cb1291805fb.zip": "a8e7a07f6fec624733ef5497d2fbe77635ce19f7ed21cc12c4af516fa507e34a",
355+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251029205532-e8d7ecb38559.zip": "9b2a84419f999a1a0b37fccb761dca75dd2cd2ec4fd4875dbe900c9d14e12b79",
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-20251025151421-4cb1291805fb
140+
github.com/cockroachdb/pebble v0.0.0-20251029205532-e8d7ecb38559
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-20251025151421-4cb1291805fb h1:ywJSW1Eg4kpPfAOZ2z+ZCMu639UD3omDqRaeyNPpOVg=
576-
github.com/cockroachdb/pebble v0.0.0-20251025151421-4cb1291805fb/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
575+
github.com/cockroachdb/pebble v0.0.0-20251029205532-e8d7ecb38559 h1:ov6vATG9hZ7bwMYnrrmRrSRvaqAzCGlrNMjOqc8ivzA=
576+
github.com/cockroachdb/pebble v0.0.0-20251029205532-e8d7ecb38559/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
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/base/store_spec.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,15 @@ func NewStoreSpec(value string) (StoreSpec, error) {
213213
// Parse the options just to fail early if invalid. We'll parse
214214
// them again later when constructing the store engine.
215215
var opts pebble.Options
216-
if err := opts.Parse(buf.String(), nil); err != nil {
216+
var pebbleOptionsErrs error
217+
err := opts.Parse(buf.String(), &pebble.ParseHooks{
218+
OnUnknown: func(name, value string) {
219+
pebbleOptionsErrs = errors.CombineErrors(pebbleOptionsErrs,
220+
errors.Newf("unknown option: %s=%s", name, value))
221+
},
222+
})
223+
err = errors.CombineErrors(err, pebbleOptionsErrs)
224+
if err != nil {
217225
return StoreSpec{}, err
218226
}
219227
ss.PebbleOptions = buf.String()

‎pkg/base/store_spec_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ max_manifest_file_size=134217728
3939
max_open_files=1000
4040
mem_table_size=4194304
4141
mem_table_stop_writes_threshold=2
42-
min_compaction_rate=4194304
43-
min_flush_rate=1048576
44-
table_property_collectors=[]
4542
wal_dir=
4643
[Level "0"]
4744
block_restart_interval=16
@@ -156,7 +153,7 @@ target_file_size=2097152`
156153
{"path=/,pebble=[Options] l0_compaction_threshold=2 l0_stop_writes_threshold=10", "", StoreSpec{Path: "/",
157154
PebbleOptions: "[Options]\nl0_compaction_threshold=2\nl0_stop_writes_threshold=10"}},
158155
{fmt.Sprintf("path=/,pebble=%s", examplePebbleOptions), "", StoreSpec{Path: "/", PebbleOptions: examplePebbleOptions}},
159-
{"path=/mnt/hda1,pebble=[Options] not_a_real_option=10", "pebble: unknown option: Options.not_a_real_option", StoreSpec{}},
156+
{"path=/mnt/hda1,pebble=[Options] not_a_real_option=10", "unknown option: Options.not_a_real_option=10", StoreSpec{}},
160157

161158
// all together
162159
{"path=/mnt/hda1,attrs=hdd:ssd,size=20GiB", "", StoreSpec{

0 commit comments

Comments
 (0)