Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

storage: bump Pebble to the updated Category API #133643

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
storage: bump Pebble to the updated Category API
Changes:

 * [`71bb6ba2`](cockroachdb/pebble@71bb6ba2) sstable: make Category an enum

Release note: none.
Epic: none.
  • Loading branch information
RaduBerinde committed Nov 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 7843995f1ad55043a4b92666c7c072135b1595c5
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
@@ -1858,10 +1858,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "e41ceb5cf0e6414106716e5855e9fcda10923a7db5dcff96514bf1f8d9f17009",
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20241101145121-c1712d15aa34",
sha256 = "6bcad566def61b8b55888a1b53bbb2c358202d068ac15ca83955b0eea60a77de",
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20241101200137-71bb6ba29095",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241101145121-c1712d15aa34.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241101200137-71bb6ba29095.zip",
],
)
go_repository(
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
@@ -354,7 +354,7 @@ DISTDIR_FILES = {
"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/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241101145121-c1712d15aa34.zip": "e41ceb5cf0e6414106716e5855e9fcda10923a7db5dcff96514bf1f8d9f17009",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241101200137-71bb6ba29095.zip": "6bcad566def61b8b55888a1b53bbb2c358202d068ac15ca83955b0eea60a77de",
"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",
24 changes: 24 additions & 0 deletions docs/generated/metrics/metrics.html
Original file line number Diff line number Diff line change
@@ -723,24 +723,48 @@
<tr><td>STORAGE</td><td>storage.iterator.block-load.bytes</td><td>Bytes loaded by storage engine iterators (possibly cached). See storage.AggregatedIteratorStats for details.</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.block-load.cached-bytes</td><td>Bytes loaded by storage engine iterators from the block cache. See storage.AggregatedIteratorStats for details.</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.block-load.read-duration</td><td>Cumulative time storage engine iterators spent loading blocks from durable storage. See storage.AggregatedIteratorStats for details.</td><td>Nanoseconds</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-backup.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-backup.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-backup.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-batch-eval.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-batch-eval.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-batch-eval.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-crdb-unknown.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-crdb-unknown.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-crdb-unknown.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-intent-resolution.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-intent-resolution.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-intent-resolution.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-mvcc-gc.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-mvcc-gc.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-mvcc-gc.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-compaction.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-compaction.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-compaction.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-get.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-get.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-get.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-ingest.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-ingest.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-pebble-ingest.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-range-snap.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-range-snap.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-range-snap.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-rangefeed.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-rangefeed.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-rangefeed.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-replication.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-replication.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-replication.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-background.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-background.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-background.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-regular.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-regular.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-scan-regular.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-unknown.block-load.bytes</td><td>Bytes loaded by storage sstable iterators (possibly cached).</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-unknown.block-load.cached-bytes</td><td>Bytes loaded by storage sstable iterators from the block cache</td><td>Bytes</td><td>COUNTER</td><td>BYTES</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.category-unknown.block-load.latency-sum</td><td>Cumulative latency for loading bytes not in the block cache, by storage sstable iterators</td><td>Latency</td><td>COUNTER</td><td>NANOSECONDS</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.external.seeks</td><td>Cumulative count of seeks performed on storage engine iterators. See storage.AggregatedIteratorStats for details.</td><td>Iterator Ops</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.external.steps</td><td>Cumulative count of steps performed on storage engine iterators. See storage.AggregatedIteratorStats for details.</td><td>Iterator Ops</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
<tr><td>STORAGE</td><td>storage.iterator.internal.seeks</td><td>Cumulative count of seeks performed internally within storage engine iterators.<br/><br/>A value high relative to &#39;storage.iterator.external.seeks&#39;<br/>is a good indication that there&#39;s an accumulation of garbage<br/>internally within the storage engine.<br/><br/>See storage.AggregatedIteratorStats for details.</td><td>Iterator Ops</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -135,7 +135,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-20241101145121-c1712d15aa34
github.com/cockroachdb/pebble v0.0.0-20241101200137-71bb6ba29095
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
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -545,8 +545,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
github.com/cockroachdb/pebble v0.0.0-20241101145121-c1712d15aa34 h1:oSGy+pL9VZaaDOOhZbNBvKovWlmmfu/V1UfUz60xUNU=
github.com/cockroachdb/pebble v0.0.0-20241101145121-c1712d15aa34/go.mod h1:XmS8uVDd9YFw/1R7J0J/CmTUANwT7iGnBRxH9AyDA90=
github.com/cockroachdb/pebble v0.0.0-20241101200137-71bb6ba29095 h1:snp44aGGOyq4FLXVv0XU4TDOvIiQ7i6G/uNSXPuYPnA=
github.com/cockroachdb/pebble v0.0.0-20241101200137-71bb6ba29095/go.mod h1:XmS8uVDd9YFw/1R7J0J/CmTUANwT7iGnBRxH9AyDA90=
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=
Loading
Loading