Skip to content

Commit d1cef1a

Browse files
craig[bot]RaduBerinde
craig[bot]
and
RaduBerinde
committed
Merge #155738
155738: go.mod: bump Pebble to d10d78a21f4f r=RaduBerinde a=RaduBerinde Changes: * [`d10d78a2`](cockroachdb/pebble@d10d78a2) db: don't inject GetDiskUsage errors in TestIteratorErrors * [`fa478f84`](cockroachdb/pebble@fa478f84) db: remove unnecessary metric updates * [`8375b02b`](cockroachdb/pebble@8375b02b) db: fix BlobBytesCompacted accounting * [`334ce8f9`](cockroachdb/pebble@334ce8f9) db: initialize more LevelMetrics fields on recovery * [`df921f11`](cockroachdb/pebble@df921f11) metamorphic: fix TestOptionsRoundtrip for TombstoneDenseCompactionThreshold * [`e62a303a`](cockroachdb/pebble@e62a303a) compact: make TombstoneDenseCompactionThreshold dynamically reconfigurable * [`3dd8e6f3`](cockroachdb/pebble@3dd8e6f3) db: factor out version recovery * [`323c0497`](cockroachdb/pebble@323c0497) db: move recoverState into recovery.go * [`63443149`](cockroachdb/pebble@63443149) db: pull timeNow into Options.private * [`83c41dc9`](cockroachdb/pebble@83c41dc9) db: deflake TestOpenRecovery * [`fc29b046`](cockroachdb/pebble@fc29b046) db: simplify shouldWriteBlobFiles * [`785e7fb8`](cockroachdb/pebble@785e7fb8) db: add TestReadOnlyRecovery * [`7f037752`](cockroachdb/pebble@7f037752) db: don't configure WAL failover if ReadOnly * [`b6f94f3f`](cockroachdb/pebble@b6f94f3f) db: only delete obsolete WALs if not ReadOnly * [`7cb70d42`](cockroachdb/pebble@7cb70d42) db: delete obsolete files before scheduling flushes, compactions * [`aa9627b6`](cockroachdb/pebble@aa9627b6) workflows: use Go 1.25 * [`d5392e3c`](cockroachdb/pebble@d5392e3c) db: add backwards compatibility warnings * [`6c342d82`](cockroachdb/pebble@6c342d82) db: add fail-safe to the delete pacer * [`7b8c50bf`](cockroachdb/pebble@7b8c50bf) db: include obsolete blob files for delete pacer * [`30544069`](cockroachdb/pebble@30544069) pebble: fix typo Release note: none. Epic: none. Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
2 parents 7d8dc7e + 42be771 commit d1cef1a

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
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 = "4e0adc1e3609c559ce16f6b8eea505ca76e60f97493b8dfb5182d7a65e26ce54",
1838-
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251014195856-f213f584df14",
1837+
sha256 = "00dccc178113bf65c540a779f00b13a3bf65b6b4876b22a3afb65cc1d1431e84",
1838+
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251020212309-d10d78a21f4f",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251014195856-f213f584df14.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251020212309-d10d78a21f4f.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
@@ -356,7 +356,7 @@ DISTDIR_FILES = {
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
359-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251014195856-f213f584df14.zip": "4e0adc1e3609c559ce16f6b8eea505ca76e60f97493b8dfb5182d7a65e26ce54",
359+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251020212309-d10d78a21f4f.zip": "00dccc178113bf65c540a779f00b13a3bf65b6b4876b22a3afb65cc1d1431e84",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
362362
"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
@@ -142,7 +142,7 @@ require (
142142
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
143143
github.com/cockroachdb/gostdlib v1.19.0
144144
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
145-
github.com/cockroachdb/pebble v0.0.0-20251014195856-f213f584df14
145+
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f
146146
github.com/cockroachdb/redact v1.1.6
147147
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
148148
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
@@ -577,8 +577,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
577577
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
578578
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
579579
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
580-
github.com/cockroachdb/pebble v0.0.0-20251014195856-f213f584df14 h1:c46IRczKAz+xMHZj9NdfV6G8c/n5HoTNa9bm72vK0tc=
581-
github.com/cockroachdb/pebble v0.0.0-20251014195856-f213f584df14/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
580+
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f h1:KldvpaS98v/pvRAzNmUkZKUSrnw/imqmZbVAclGLwgU=
581+
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
582582
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
583583
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
584584
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

‎pkg/ccl/storageccl/engineccl/encrypted_fs_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ type errorInjector struct {
471471
}
472472

473473
func (i *errorInjector) MaybeError(op errorfs.Op) error {
474-
if i.startInjecting && op.Kind.ReadOrWrite() == errorfs.OpIsWrite &&
474+
if i.startInjecting && op.Kind.IsWrite() &&
475475
!strings.HasPrefix(op.Path, "TEST") && i.rand.Float64() < i.prob {
476476
return errors.WithStack(errorfs.ErrInjected)
477477
}

‎pkg/cli/testdata/ear-list‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
list
22
----
3-
000002.log:
3+
000003.log:
44
env type: Data, AES128_CTR
55
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
6-
nonce: 06 c2 26 f9 68 f0 fc ff b9 e7 82 8f
7-
counter: 914487965
6+
nonce: d3 97 11 b3 1a ed 22 2b 74 fb 02 0c
7+
counter: 1229228536
88
000004.log:
99
env type: Data, AES128_CTR
1010
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
@@ -25,11 +25,11 @@ MANIFEST-000001:
2525
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
2626
nonce: 2e fd 49 2f 5f c5 53 0a e8 8f 78 cc
2727
counter: 110434741
28-
OPTIONS-000003:
28+
OPTIONS-000002:
2929
env type: Data, AES128_CTR
3030
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
31-
nonce: 0c 07 ac 42 50 0d 38 20 3c 91 cf c0
32-
counter: 1731579598
31+
nonce: 06 c2 26 f9 68 f0 fc ff b9 e7 82 8f
32+
counter: 914487965
3333
marker.datakeys.000001.COCKROACHDB_DATA_KEYS_000001_monolith:
3434
env type: Store, AES128_CTR
3535
keyID: f594229216d81add7811c4360212eb7629b578ef4eab6e5d05679b3c5de48867

0 commit comments

Comments
 (0)