go.mod: bump Pebble to 837c19b81bab

jbowens · jbowens · commit 39153bb2de52 · 2025-07-11T15:35:52.000-04:00
Changes: * [`837c19b8`](cockroachdb/pebble@837c19b8) db: fix double Close of directory lock during failed Open * [`b35ff004`](cockroachdb/pebble@b35ff004) db: re-export base.LockDirectory, base.DirLock * [`7d7e2f4b`](cockroachdb/pebble@7d7e2f4b) sstable: set up proper iterator transforms during EstimateDiskUsage * [`20b0451b`](cockroachdb/pebble@20b0451b) db: validate sstable's blob value liveness during DebugCheckLevels * [`ba961483`](cockroachdb/pebble@ba961483) pebble: fix wal recovery dir lock acquisition in Open * [`6feecba1`](cockroachdb/pebble@6feecba1) pebble: add blob rewrite compaction count to metrics string * [`42327e92`](cockroachdb/pebble@42327e92) fix: avoid reducing the last op in reduction process * [`33e6fedc`](cockroachdb/pebble@33e6fedc) fix: use the correct key format in reduction * [`4de9b7c5`](cockroachdb/pebble@4de9b7c5) db: reformat Metrics.String * [`0ef4b16e`](cockroachdb/pebble@0ef4b16e) sstable: add separated value retrieval internal iterator stats * [`dd0f8384`](cockroachdb/pebble@dd0f8384) pebble: lock wal directories on Open * [`c8cfc93a`](cockroachdb/pebble@c8cfc93a) db: use internal iterator stats to populate compaction bytes read * [`1dd9cda1`](cockroachdb/pebble@1dd9cda1) db: maintain per-block kind internal iterator stats * [`41687897`](cockroachdb/pebble@41687897) compression: deflake TestAdaptiveCompressorCompressible Release note: none. Epic: none.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1835,10 +1835,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "d3a727e03593def35072caac3e097b4cbc58ebafc3f8dc7294f9acfb7c4d79c0",
-        strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250708172732-a370be5e7e50",
+        sha256 = "b854ba6802c929910b6c5c2572bf9b8b408e1d4cb80db9c62af8fc19fc74dd14",
+        strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250711175034-837c19b81bab",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250708172732-a370be5e7e50.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250711175034-837c19b81bab.zip",
         ],
     )
     go_repository(
diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -358,7 +358,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-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
     "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-20250708172732-a370be5e7e50.zip": "d3a727e03593def35072caac3e097b4cbc58ebafc3f8dc7294f9acfb7c4d79c0",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250711175034-837c19b81bab.zip": "b854ba6802c929910b6c5c2572bf9b8b408e1d4cb80db9c62af8fc19fc74dd14",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
     "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",
diff --git a/go.mod b/go.mod
@@ -140,7 +140,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-20241215232642-bb51bb14a506
-	github.com/cockroachdb/pebble v0.0.0-20250708172732-a370be5e7e50
+	github.com/cockroachdb/pebble v0.0.0-20250711175034-837c19b81bab
 	github.com/cockroachdb/redact v1.1.6
 	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
@@ -582,8 +582,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
 github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
 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-20250708172732-a370be5e7e50 h1:nURMd/syIIPsnG2yFt0rx4kUFmjSuCIuGys74/YQxEY=
-github.com/cockroachdb/pebble v0.0.0-20250708172732-a370be5e7e50/go.mod h1:LLa+I2vZrOsrsy4QcuZ6wSXBNQll7erNg3GCr8NpE90=
+github.com/cockroachdb/pebble v0.0.0-20250711175034-837c19b81bab h1:TL4dKn78L2rqTb2bOMnLJjYoyx7NQUOyi/BD0UDYAjo=
+github.com/cockroachdb/pebble v0.0.0-20250711175034-837c19b81bab/go.mod h1:LLa+I2vZrOsrsy4QcuZ6wSXBNQll7erNg3GCr8NpE90=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
 github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
diff --git a/pkg/cli/interactive_tests/test_encryption.tcl b/pkg/cli/interactive_tests/test_encryption.tcl
@@ -53,7 +53,7 @@ end_test
 
 start_test "Run pebble debug tool."
 send "$argv debug pebble db lsm $storedir\r"
-eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w  | refsz  valblk\r"
+eexpect "LSM"
 end_test
 
 start_test "Restart with plaintext."
@@ -107,7 +107,7 @@ end_test
 
 start_test "Run pebble debug tool with AES-256."
 send "$argv debug pebble db lsm $storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=$keydir/aes-256.key\r"
-eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w  | refsz  valblk\r"
+eexpect "LSM"
 # Try running without the encryption flag.
 send "$argv debug pebble db lsm $storedir\r"
 eexpect "If this is an encrypted store, make sure the correct encryption key is set."
diff --git a/pkg/storage/engine.go b/pkg/storage/engine.go
@@ -1348,7 +1348,7 @@ func (m *Metrics) IngestedBytes() uint64 {
 // compactions across all levels of the LSM.
 func (m *Metrics) CompactedBytes() (read, written uint64) {
 	for _, lm := range m.Metrics.Levels {
-		read += lm.TableBytesRead + lm.BlobBytesReadEstimate
+		read += lm.TableBytesRead + lm.BlobBytesRead
 		written += lm.TableBytesCompacted + lm.BlobBytesCompacted
 	}
 	return read, written
@@ -1404,7 +1404,7 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
 			BytesIn:         l.TableBytesIn,
 			BytesIngested:   l.TableBytesIngested,
 			BytesMoved:      l.TableBytesMoved,
-			BytesRead:       l.TableBytesRead + l.BlobBytesReadEstimate,
+			BytesRead:       l.TableBytesRead + l.BlobBytesRead,
 			BytesCompacted:  l.TableBytesCompacted + l.BlobBytesCompacted,
 			BytesFlushed:    l.TableBytesFlushed + l.BlobBytesFlushed,
 			TablesCompacted: l.TablesCompacted,
diff --git a/pkg/storage/fs/fs.go b/pkg/storage/fs/fs.go
@@ -228,7 +228,7 @@ type Env struct {
 	UnencryptedFS vfs.FS
 	// DirectoryLock is a file lock preventing other processes from opening the
 	// database or encryption-at-rest registry within this data directory.
-	DirectoryLock *pebble.Lock
+	DirectoryLock *pebble.DirLock
 	// Registry is non-nil if encryption-at-rest has ever been enabled on the
 	// store. The registry maintains a mapping of all encrypted keys and the
 	// corresponding data key with which they're encrypted.
diff --git a/pkg/storage/mvcc.go b/pkg/storage/mvcc.go
@@ -4397,8 +4397,9 @@ func recordIteratorStats(iter iteratorWithStats, scanStats *kvpb.ScanStats) {
 	scanStats.NumInternalSeeks += uint64(internalSeeks)
 	scanStats.NumInterfaceSteps += uint64(steps)
 	scanStats.NumInternalSteps += uint64(internalSteps)
-	scanStats.BlockBytes += stats.InternalStats.BlockBytes
-	scanStats.BlockBytesInCache += stats.InternalStats.BlockBytesInCache
+	blockReads := stats.InternalStats.TotalBlockReads()
+	scanStats.BlockBytes += blockReads.BlockBytes
+	scanStats.BlockBytesInCache += blockReads.BlockBytesInCache
 	scanStats.KeyBytes += stats.InternalStats.KeyBytes
 	scanStats.ValueBytes += stats.InternalStats.ValueBytes
 	scanStats.PointCount += stats.InternalStats.PointCount
@@ -4409,7 +4410,7 @@ func recordIteratorStats(iter iteratorWithStats, scanStats *kvpb.ScanStats) {
 	scanStats.SeparatedPointCount += stats.InternalStats.SeparatedPointValue.Count
 	scanStats.SeparatedPointValueBytes += stats.InternalStats.SeparatedPointValue.ValueBytes
 	scanStats.SeparatedPointValueBytesFetched += stats.InternalStats.SeparatedPointValue.ValueBytesFetched
-	scanStats.BlockReadDuration += stats.InternalStats.BlockReadDuration
+	scanStats.BlockReadDuration += blockReads.BlockReadDuration
 }
 
 // mvccScanInit performs some preliminary checks on the validity of options for
diff --git a/pkg/storage/open.go b/pkg/storage/open.go
@@ -292,6 +292,7 @@ func makeExternalWALDir(
 	}
 	engineCfg.afterClose = append(engineCfg.afterClose, env.Close)
 	return wal.Dir{
+		Lock:    env.DirectoryLock,
 		FS:      env,
 		Dirname: externalDir.Path,
 	}, nil
diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go
@@ -1414,11 +1414,12 @@ func (p *Pebble) Close() {
 // iterator stats when an iterator is closed or its stats are reset. These
 // aggregated stats are exposed through GetMetrics.
 func (p *Pebble) aggregateIterStats(stats IteratorStats) {
+	blockReads := stats.Stats.InternalStats.TotalBlockReads()
 	p.iterStats.Lock()
 	defer p.iterStats.Unlock()
-	p.iterStats.BlockBytes += stats.Stats.InternalStats.BlockBytes
-	p.iterStats.BlockBytesInCache += stats.Stats.InternalStats.BlockBytesInCache
-	p.iterStats.BlockReadDuration += stats.Stats.InternalStats.BlockReadDuration
+	p.iterStats.BlockBytes += blockReads.BlockBytes
+	p.iterStats.BlockBytesInCache += blockReads.BlockBytesInCache
+	p.iterStats.BlockReadDuration += blockReads.BlockReadDuration
 	p.iterStats.ExternalSeeks += stats.Stats.ForwardSeekCount[pebble.InterfaceCall] + stats.Stats.ReverseSeekCount[pebble.InterfaceCall]
 	p.iterStats.ExternalSteps += stats.Stats.ForwardStepCount[pebble.InterfaceCall] + stats.Stats.ReverseStepCount[pebble.InterfaceCall]
 	p.iterStats.InternalSeeks += stats.Stats.ForwardSeekCount[pebble.InternalIterCall] + stats.Stats.ReverseSeekCount[pebble.InternalIterCall]

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ func makeExternalWALDir(`
`292`	`292`	`}`
`293`	`293`	`engineCfg.afterClose = append(engineCfg.afterClose, env.Close)`
`294`	`294`	`return wal.Dir{`
	`295`	`+ Lock: env.DirectoryLock,`
`295`	`296`	`FS: env,`
`296`	`297`	`Dirname: externalDir.Path,`
`297`	`298`	`}, nil`