diff --git a/DEPS.bzl b/DEPS.bzl index c85294c00664..f9016658bc1d 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -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/pebble@v0.0.0-20220816161053-c04897ea894f", + sha256 = "6d348c25c032bcaafe9de96e2501cce07568adadf76381f2d976f3129a4ecaca", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-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( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 896f199b51a8..dffb1165ff04 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -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", diff --git a/go.mod b/go.mod index 90fb356bc227..d2a5b068fd07 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 395678b9392d..2a5f473b9f69 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index e4abac5b1752..e372c5465510 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -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. diff --git a/vendor b/vendor index f75c86555397..e62446a5c063 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit f75c86555397b3b01da5d61e962bd46bbdb4cd47 +Subproject commit e62446a5c06325aec413163fcbd3932c38689615