Skip to content

Commit 6e011c4

Browse files
authored
Revert "ethdb/pebble: add level file metrics (ethereum#28271)"
This reverts commit 9bff43b.
1 parent ba42dbf commit 6e011c4

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

ethdb/pebble/pebble.go

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ type Database struct {
7171
seekCompGauge metrics.Gauge // Gauge for tracking the number of table compaction caused by read opt
7272
manualMemAllocGauge metrics.Gauge // Gauge for tracking amount of non-managed memory currently allocated
7373

74-
levelsGauge []metrics.Gauge // Gauge for tracking the number of tables in levels
75-
7674
quitLock sync.RWMutex // Mutex protecting the quit channel and the closed flag
7775
quitChan chan chan error // Quit channel to stop the metrics collection before closing the database
7876
closed bool // keep track of whether we're Closed
@@ -232,7 +230,7 @@ func New(file string, cache int, handles int, namespace string, readonly bool, e
232230
db.manualMemAllocGauge = metrics.NewRegisteredGauge(namespace+"memory/manualalloc", nil)
233231

234232
// Start up the metrics gathering and return
235-
go db.meter(metricsGatheringInterval, namespace)
233+
go db.meter(metricsGatheringInterval)
236234
return db, nil
237235
}
238236

@@ -429,7 +427,7 @@ func (d *Database) Path() string {
429427

430428
// meter periodically retrieves internal pebble counters and reports them to
431429
// the metrics subsystem.
432-
func (d *Database) meter(refresh time.Duration, namespace string) {
430+
func (d *Database) meter(refresh time.Duration) {
433431
var errc chan error
434432
timer := time.NewTimer(refresh)
435433
defer timer.Stop()
@@ -452,7 +450,7 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
452450
compRead int64
453451
nWrite int64
454452

455-
stats = d.db.Metrics()
453+
metrics = d.db.Metrics()
456454
compTime = d.compTime.Load()
457455
writeDelayCount = d.writeDelayCount.Load()
458456
writeDelayTime = d.writeDelayTime.Load()
@@ -463,14 +461,14 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
463461
writeDelayCounts[i%2] = writeDelayCount
464462
compTimes[i%2] = compTime
465463

466-
for _, levelMetrics := range stats.Levels {
464+
for _, levelMetrics := range metrics.Levels {
467465
nWrite += int64(levelMetrics.BytesCompacted)
468466
nWrite += int64(levelMetrics.BytesFlushed)
469467
compWrite += int64(levelMetrics.BytesCompacted)
470468
compRead += int64(levelMetrics.BytesRead)
471469
}
472470

473-
nWrite += int64(stats.WAL.BytesWritten)
471+
nWrite += int64(metrics.WAL.BytesWritten)
474472

475473
compWrites[i%2] = compWrite
476474
compReads[i%2] = compRead
@@ -492,7 +490,7 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
492490
d.compWriteMeter.Mark(compWrites[i%2] - compWrites[(i-1)%2])
493491
}
494492
if d.diskSizeGauge != nil {
495-
d.diskSizeGauge.Update(int64(stats.DiskSpaceUsage()))
493+
d.diskSizeGauge.Update(int64(metrics.DiskSpaceUsage()))
496494
}
497495
if d.diskReadMeter != nil {
498496
d.diskReadMeter.Mark(0) // pebble doesn't track non-compaction reads
@@ -501,20 +499,12 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
501499
d.diskWriteMeter.Mark(nWrites[i%2] - nWrites[(i-1)%2])
502500
}
503501
// See https://github.com/cockroachdb/pebble/pull/1628#pullrequestreview-1026664054
504-
manuallyAllocated := stats.BlockCache.Size + int64(stats.MemTable.Size) + int64(stats.MemTable.ZombieSize)
502+
manuallyAllocated := metrics.BlockCache.Size + int64(metrics.MemTable.Size) + int64(metrics.MemTable.ZombieSize)
505503
d.manualMemAllocGauge.Update(manuallyAllocated)
506-
d.memCompGauge.Update(stats.Flush.Count)
504+
d.memCompGauge.Update(metrics.Flush.Count)
507505
d.nonlevel0CompGauge.Update(nonLevel0CompCount)
508506
d.level0CompGauge.Update(level0CompCount)
509-
d.seekCompGauge.Update(stats.Compact.ReadCount)
510-
511-
for i, level := range stats.Levels {
512-
// Append metrics for additional layers
513-
if i >= len(d.levelsGauge) {
514-
d.levelsGauge = append(d.levelsGauge, metrics.NewRegisteredGauge(namespace+fmt.Sprintf("tables/level%v", i), nil))
515-
}
516-
d.levelsGauge[i].Update(level.NumFiles)
517-
}
507+
d.seekCompGauge.Update(metrics.Compact.ReadCount)
518508

519509
// Sleep a bit, then repeat the stats collection
520510
select {

0 commit comments

Comments
 (0)