metrics: compute InternalIntervalMetrics without making calls to GetInternalIntervalMetrics

pkg/server/node.go

@@ -856,17 +856,15 @@ func (n *Node) GetPebbleMetrics() []admission.StoreMetrics {
 	var metrics []admission.StoreMetrics
 	_ = n.stores.VisitStores(func(store *kvserver.Store) error {
 		m := store.Engine().GetMetrics()
-		im := store.Engine().GetInternalIntervalMetrics()
 		diskStats := admission.DiskStats{ProvisionedBandwidth: clusterProvisionedBandwidth}
 		if s, ok := storeIDToDiskStats[store.StoreID()]; ok {
 			diskStats = s
 		}
 		metrics = append(metrics, admission.StoreMetrics{
-			StoreID:                 int32(store.StoreID()),
-			Metrics:                 m.Metrics,
-			WriteStallCount:         m.WriteStallCount,
-			InternalIntervalMetrics: im,
-			DiskStats:               diskStats})
+			StoreID:         int32(store.StoreID()),
+			Metrics:         m.Metrics,
+			WriteStallCount: m.WriteStallCount,
+			DiskStats:       diskStats})
 		return nil
 	})
 	return metrics

pkg/storage/engine.go

@@ -929,12 +929,6 @@ type Engine interface {
 	// storage min version is at least the target version.
 	MinVersionIsAtLeastTargetVersion(target roachpb.Version) (bool, error)
 
-	// GetInternalIntervalMetrics returns low-level metrics from Pebble, that
-	// are reset at every interval, where an interval is defined over successive
-	// calls to this method. Hence, this should be used with care, with only one
-	// caller, which is currently the admission control subsystem.
-	GetInternalIntervalMetrics() *pebble.InternalIntervalMetrics
-
 	// SetCompactionConcurrency is used to set the engine's compaction
 	// concurrency. It returns the previous compaction concurrency.
 	SetCompactionConcurrency(n uint64) uint64

pkg/storage/pebble.go

@@ -1528,11 +1528,6 @@ func (p *Pebble) GetMetrics() Metrics {
 	}
 }
 
-// GetInternalIntervalMetrics implements the Engine interface.
-func (p *Pebble) GetInternalIntervalMetrics() *pebble.InternalIntervalMetrics {
-	return p.db.InternalIntervalMetrics()
-}
-
 // GetEncryptionRegistries implements the Engine interface.
 func (p *Pebble) GetEncryptionRegistries() (*EncryptionRegistries, error) {
 	rv := &EncryptionRegistries{}

pkg/util/admission/granter.go

@@ -643,7 +643,6 @@ type StoreMetrics struct {
 	StoreID int32
 	*pebble.Metrics
 	WriteStallCount int64
-	*pebble.InternalIntervalMetrics
 	// Optional.
 	DiskStats DiskStats
 }

pkg/util/admission/io_load_listener.go

@@ -175,8 +175,9 @@ type ioLoadListenerState struct {
 	// Gauge.
 	curL0Bytes int64
 	// Cumulative.
-	cumWriteStallCount int64
-	diskBW             struct {
+	cumWriteStallCount      int64
+	cumFlushWriteThroughput pebble.ThroughputMetric
+	diskBW                  struct {
 		// Cumulative
 		bytesRead        uint64
 		bytesWritten     uint64
@@ -309,10 +310,12 @@ func (io *ioLoadListener) pebbleMetricsTick(ctx context.Context, metrics StoreMe
 		io.diskBW.bytesRead = metrics.DiskStats.BytesRead
 		io.diskBW.bytesWritten = metrics.DiskStats.BytesWritten
 		io.diskBW.incomingLSMBytes = cumLSMIncomingBytes
+		io.cumFlushWriteThroughput = metrics.Flush.WriteThroughput
 		io.copyAuxEtcFromPerWorkEstimator()
 		return
 	}
 	io.adjustTokens(ctx, metrics)
+	io.cumFlushWriteThroughput = metrics.Flush.WriteThroughput
 }
 
 // allocateTokensTick gives out 1/ticksInAdjustmentInterval of the
@@ -380,10 +383,13 @@ func computeIntervalDiskLoadInfo(
 // 100+ms for all write traffic.
 func (io *ioLoadListener) adjustTokens(ctx context.Context, metrics StoreMetrics) {
 	sas := io.kvRequester.getStoreAdmissionStats()
-	// Copy the cumulative disk banwidth values for later use.
+	// Copy the cumulative disk bandwidth values for later use.
 	cumDiskBW := io.ioLoadListenerState.diskBW
+	wt := metrics.Flush.WriteThroughput
+	wt.Subtract(io.cumFlushWriteThroughput)
+
 	res := io.adjustTokensInner(ctx, io.ioLoadListenerState,
-		metrics.Levels[0], metrics.WriteStallCount, metrics.InternalIntervalMetrics,
+		metrics.Levels[0], metrics.WriteStallCount, wt,
 		L0FileCountOverloadThreshold.Get(&io.settings.SV),
 		L0SubLevelCountOverloadThreshold.Get(&io.settings.SV),
 		MinFlushUtilizationFraction.Get(&io.settings.SV),
@@ -480,7 +486,7 @@ func (*ioLoadListener) adjustTokensInner(
 	prev ioLoadListenerState,
 	l0Metrics pebble.LevelMetrics,
 	cumWriteStallCount int64,
-	im *pebble.InternalIntervalMetrics,
+	flushWriteThroughput pebble.ThroughputMetric,
 	threshNumFiles, threshNumSublevels int64,
 	minFlushUtilTargetFraction float64,
 ) adjustTokensResult {
@@ -611,12 +617,12 @@ func (*ioLoadListener) adjustTokensInner(
 	// Compute flush utilization for this interval. A very low flush utilization
 	// will cause flush tokens to be unlimited.
 	intFlushUtilization := float64(0)
-	if im.Flush.WriteThroughput.WorkDuration > 0 {
-		intFlushUtilization = float64(im.Flush.WriteThroughput.WorkDuration) /
-			float64(im.Flush.WriteThroughput.WorkDuration+im.Flush.WriteThroughput.IdleDuration)
+	if flushWriteThroughput.WorkDuration > 0 {
+		intFlushUtilization = float64(flushWriteThroughput.WorkDuration) /
+			float64(flushWriteThroughput.WorkDuration+flushWriteThroughput.IdleDuration)
 	}
 	// Compute flush tokens for this interval that would cause 100% utilization.
-	intFlushTokens := float64(im.Flush.WriteThroughput.PeakRate()) * adjustmentInterval
+	intFlushTokens := float64(flushWriteThroughput.PeakRate()) * adjustmentInterval
 	intWriteStalls := cumWriteStallCount - prev.cumWriteStallCount
 
 	// Ensure flushUtilTargetFraction is in the configured bounds. This also

pkg/util/admission/io_load_listener_test.go

@@ -38,6 +38,9 @@ func TestIOLoadListener(t *testing.T) {
 	req := &testRequesterForIOLL{}
 	kvGranter := &testGranterWithIOTokens{}
 	var ioll *ioLoadListener
+	var cumFlushBytes int64
+	var cumFlushWork, cumFlushIdle time.Duration
+
 	ctx := context.Background()
 	st := cluster.MakeTestingClusterSettings()
 	datadriven.RunTest(t, testutils.TestDataPath(t, "io_load_listener"),
@@ -56,6 +59,11 @@ func TestIOLoadListener(t *testing.T) {
 				// active.
 				ioll.mu.Mutex = &syncutil.Mutex{}
 				ioll.mu.kvGranter = kvGranter
+
+				// Reset the cumulative data
+				cumFlushBytes = 0
+				cumFlushWork = time.Duration(0)
+				cumFlushIdle = time.Duration(0)
 				return ""
 
 			case "prep-admission-stats":
@@ -112,13 +120,15 @@ func TestIOLoadListener(t *testing.T) {
 					d.ScanArgs(t, "flush-work-sec", &flushWorkSec)
 					d.ScanArgs(t, "flush-idle-sec", &flushIdleSec)
 				}
-				flushMetric := pebble.ThroughputMetric{
-					Bytes:        int64(flushBytes),
-					WorkDuration: time.Duration(flushWorkSec) * time.Second,
-					IdleDuration: time.Duration(flushIdleSec) * time.Second,
-				}
-				im := &pebble.InternalIntervalMetrics{}
-				im.Flush.WriteThroughput = flushMetric
+
+				cumFlushIdle += time.Duration(flushIdleSec) * time.Second
+				cumFlushWork += time.Duration(flushWorkSec) * time.Second
+				cumFlushBytes += int64(flushBytes)
+
+				metrics.Flush.WriteThroughput.Bytes = cumFlushBytes
+				metrics.Flush.WriteThroughput.IdleDuration = cumFlushIdle
+				metrics.Flush.WriteThroughput.WorkDuration = cumFlushWork
+
 				var writeStallCount int
 				if d.HasArg("write-stall-count") {
 					d.ScanArgs(t, "write-stall-count", &writeStallCount)
@@ -151,10 +161,10 @@ func TestIOLoadListener(t *testing.T) {
 				if d.HasArg("print-only-first-tick") {
 					d.ScanArgs(t, "print-only-first-tick", &printOnlyFirstTick)
 				}
+
 				ioll.pebbleMetricsTick(ctx, StoreMetrics{
-					Metrics:                 &metrics,
-					WriteStallCount:         int64(writeStallCount),
-					InternalIntervalMetrics: im,
+					Metrics:         &metrics,
+					WriteStallCount: int64(writeStallCount),
 					DiskStats: DiskStats{
 						BytesRead:            uint64(bytesRead),
 						BytesWritten:         uint64(bytesWritten),
@@ -212,10 +222,8 @@ func TestIOLoadListenerOverflow(t *testing.T) {
 		Sublevels: 100,
 		NumFiles:  10000,
 	}
-	ioll.pebbleMetricsTick(ctx,
-		StoreMetrics{Metrics: &m, InternalIntervalMetrics: &pebble.InternalIntervalMetrics{}})
-	ioll.pebbleMetricsTick(ctx,
-		StoreMetrics{Metrics: &m, InternalIntervalMetrics: &pebble.InternalIntervalMetrics{}})
+	ioll.pebbleMetricsTick(ctx, StoreMetrics{Metrics: &m})
+	ioll.pebbleMetricsTick(ctx, StoreMetrics{Metrics: &m})
 	ioll.allocateTokensTick()
 }
 
@@ -257,7 +265,7 @@ func TestAdjustTokensInnerAndLogging(t *testing.T) {
 	for _, tt := range tests {
 		buf.Printf("%s:\n", tt.name)
 		res := (*ioLoadListener)(nil).adjustTokensInner(
-			ctx, tt.prev, tt.l0Metrics, 12, &pebble.InternalIntervalMetrics{},
+			ctx, tt.prev, tt.l0Metrics, 12, pebble.ThroughputMetric{},
 			100, 10, 0.50)
 		buf.Printf("%s\n", res)
 	}
@@ -303,9 +311,8 @@ func TestBadIOLoadListenerStats(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		randomValues()
 		ioll.pebbleMetricsTick(ctx, StoreMetrics{
-			Metrics:                 &m,
-			InternalIntervalMetrics: &pebble.InternalIntervalMetrics{},
-			DiskStats:               d,
+			Metrics:   &m,
+			DiskStats: d,
 		})
 		for j := 0; j < ticksInAdjustmentInterval; j++ {
 			ioll.allocateTokensTick()