Skip to content

Commit

Permalink
Merge #113178
Browse files Browse the repository at this point in the history 
113178: go.mod: bump Pebble to f522e2f9b146 r=sumeerbhola a=nicktrav

```
f522e2f9 build: use go1.21
422dce91 db: add Errorf to Logger interface
38191218 db: retry manual compactions that get cancelled
ec8d19ff vfs/errorfs: add Randomly
babd592d db: defer loading L0 range key blocks during iterator construction
dda4d0d2 vfs/errorfs: add OpFileReadAt predicate
```

Release note: None.

Epic: None.

Co-authored-by: Nick Travers <travers@cockroachlabs.com>
  • Loading branch information
@nicktrav
craig[bot] and nicktrav committed Oct 30, 2023
2 parents dd2628e + 4904314 commit 0574c0c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1599,10 +1599,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "f37a56b82a2106551b09bb776c664d64d1df576d941df566de081e3fc2a27541",
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20231019221832-593a72bf8976",
sha256 = "bec124cd207a072d5e40326cb8aa7569b7fdeb84126bb3f7edd4a75945afb331",
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20231026212857-f522e2f9b146",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231019221832-593a72bf8976.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231026212857-f522e2f9b146.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
"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/pebble/com_github_cockroachdb_pebble-v0.0.0-20231019221832-593a72bf8976.zip": "f37a56b82a2106551b09bb776c664d64d1df576d941df566de081e3fc2a27541",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231026212857-f522e2f9b146.zip": "bec124cd207a072d5e40326cb8aa7569b7fdeb84126bb3f7edd4a75945afb331",
"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",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,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-20231019221832-593a72bf8976
github.com/cockroachdb/pebble v0.0.0-20231026212857-f522e2f9b146
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/pebble v0.0.0-20231019221832-593a72bf8976 h1:6r7ojt66fRPE93ygtJHUUNd3r+9mQHXpNgYEinDJKpY=
github.com/cockroachdb/pebble v0.0.0-20231019221832-593a72bf8976/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
github.com/cockroachdb/pebble v0.0.0-20231026212857-f522e2f9b146 h1:ZXWQ/iE7nUXSpja6ewLvRdwR32ST5utpIHYfCa3AY+g=
github.com/cockroachdb/pebble v0.0.0-20231026212857-f522e2f9b146/go.mod h1:acMRUGd/BK8AUmQNK3spUCCGzFLZU2bSST3NMXSq2Kc=
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=
Expand Down
4 changes: 4 additions & 0 deletions pkg/storage/pebble.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,10 @@ func (l pebbleLogger) IsTracingEnabled(ctx context.Context) bool {
return log.HasSpanOrEvent(ctx)
}

func (l pebbleLogger) Errorf(format string, args ...interface{}) {
log.Storage.ErrorfDepth(l.ctx, l.depth, format, args...)
}

// PebbleConfig holds all configuration parameters and knobs used in setting up
// a new Pebble instance.
type PebbleConfig struct {
Expand Down
1 change: 1 addition & 0 deletions pkg/testutils/lint/passes/fmtsafe/functions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ var requireConstFmt = map[string]bool{

"(github.com/cockroachdb/cockroach/pkg/storage.pebbleLogger).Infof": true,
"(github.com/cockroachdb/cockroach/pkg/storage.pebbleLogger).Fatalf": true,
"(github.com/cockroachdb/cockroach/pkg/storage.pebbleLogger).Errorf": true,
"(github.com/cockroachdb/cockroach/pkg/storage.pebbleLogger).Eventf": true,

"(*github.com/cockroachdb/cockroach/pkg/util/grpcutil.grpcLogger).Infof": true,
Expand Down

0 comments on commit 0574c0c

Please sign in to comment.