Skip to content

Commit

Permalink
Merge #86341
Browse files Browse the repository at this point in the history 
86341: vendor: bump Pebble to 358f750befa5 r=nicktrav a=jbowens

```
358f750b db: fix Close race with WAL rotation
eff82bdf db: fix prefix iteration invariant violation
09c6e030 internal/metamorphic: improve SetOptions coverage
358c749e db: add option to force memtable flush of range keys
715b5645 db: expand TestSetOptionsEquivalence code coverage
d390a1c5 metamorphic: set iters last bounds on iter creation
```

Release note: None
Release justification: Non-production code changes, various fixes for
high severity bugs.

Co-authored-by: Jackson Owens <[email protected]>
  • Loading branch information
@jbowens
craig[bot] and jbowens committed Aug 18, 2022
2 parents 1e751ae + 4c11eaa commit 5c2c62e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1421,10 +1421,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "6365a3d3a4bb70088819a3a3e342f60277dcd1f5e418a4084e43f3d7a729f5ca",
strip_prefix = "github.com/cockroachdb/[email protected]20220816161053-c04897ea894f",
sha256 = "6d348c25c032bcaafe9de96e2501cce07568adadf76381f2d976f3129a4ecaca",
strip_prefix = "github.com/cockroachdb/[email protected]20220817213320-358f750befa5",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220816161053-c04897ea894f.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220817213320-358f750befa5.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 @@ -186,7 +186,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.13.0.zip": "b3d43d8f95edf65f73a5348f29e1159823cac64b148f8d3bb48340bf55d70872",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20211118104740-dabe8e521a4f.zip": "1972c3f171f118add3fd9e64bcea6cbb9959a3b7fa0ada308e8a7310813fea74",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220816161053-c04897ea894f.zip": "6365a3d3a4bb70088819a3a3e342f60277dcd1f5e418a4084e43f3d7a729f5ca",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220817213320-358f750befa5.zip": "6d348c25c032bcaafe9de96e2501cce07568adadf76381f2d976f3129a4ecaca",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e",
"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/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
github.com/cockroachdb/gostdlib v1.13.0
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f
github.com/cockroachdb/pebble v0.0.0-20220816161053-c04897ea894f
github.com/cockroachdb/pebble v0.0.0-20220817213320-358f750befa5
github.com/cockroachdb/redact v1.1.3
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 @@ -470,8 +470,8 @@ github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqi
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/pebble v0.0.0-20220816161053-c04897ea894f h1:U3vGUSWirNdXRcZ/2Lsu2x3dVuMOPHlC26gLPAlpo6g=
github.com/cockroachdb/pebble v0.0.0-20220816161053-c04897ea894f/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0=
github.com/cockroachdb/pebble v0.0.0-20220817213320-358f750befa5 h1:KwPwcpvNxdK9uX9fcaH5FQvGfwKVfVmfAS4QNgkGot0=
github.com/cockroachdb/pebble v0.0.0-20220817213320-358f750befa5/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0=
github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
Expand Down
6 changes: 5 additions & 1 deletion pkg/storage/pebble.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,11 @@ func DefaultPebbleOptions() *pebble.Options {
// Automatically flush 10s after the first range tombstone is added to a
// memtable. This ensures that we can reclaim space even when there's no
// activity on the database generating flushes.
opts.Experimental.DeleteRangeFlushDelay = 10 * time.Second
opts.FlushDelayDeleteRange = 10 * time.Second
// Automatically flush 10s after the first range key is added to a memtable.
// This ensures that range keys are quickly flushed, allowing use of lazy
// combined iteration within Pebble.
opts.FlushDelayRangeKey = 10 * time.Second
// Enable deletion pacing. This helps prevent disk slowness events on some
// SSDs, that kick off an expensive GC if a lot of files are deleted at
// once.
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 7 files
+14 −9 github.com/cockroachdb/pebble/compaction.go
+23 −2 github.com/cockroachdb/pebble/db.go
+5 −3 github.com/cockroachdb/pebble/flushable.go
+40 −16 github.com/cockroachdb/pebble/internal/keyspan/bounded.go
+21 −8 github.com/cockroachdb/pebble/options.go
+31 −13 github.com/cockroachdb/pebble/range_keys.go
+1 −1 modules.txt

0 comments on commit 5c2c62e

Please sign in to comment.