storage,kv: propagate ReadCategory to ComputeStats

This commit updates ComputeStats and its various variants to accept a
ReadCategory. This ensures these scans' stats are appropriately categorized.

Informs #158017.
Epic: none
Release note: none

Author: jbowens

docs/generated/metrics/metrics.yaml

@@ -16610,6 +16610,30 @@ layers:
       unit: NANOSECONDS
       aggregation: AVG
       derivative: NON_NEGATIVE_DERIVATIVE
+    - name: storage.iterator.category-consistency-checker.block-load.bytes
+      exported_name: storage_iterator_category_consistency_checker_block_load_bytes
+      description: Bytes loaded by storage sstable iterators (possibly cached).
+      y_axis_label: Bytes
+      type: COUNTER
+      unit: BYTES
+      aggregation: AVG
+      derivative: NON_NEGATIVE_DERIVATIVE
+    - name: storage.iterator.category-consistency-checker.block-load.cached-bytes
+      exported_name: storage_iterator_category_consistency_checker_block_load_cached_bytes
+      description: Bytes loaded by storage sstable iterators from the block cache
+      y_axis_label: Bytes
+      type: COUNTER
+      unit: BYTES
+      aggregation: AVG
+      derivative: NON_NEGATIVE_DERIVATIVE
+    - name: storage.iterator.category-consistency-checker.block-load.latency-sum
+      exported_name: storage_iterator_category_consistency_checker_block_load_latency_sum
+      description: Cumulative latency for loading bytes not in the block cache, by storage sstable iterators
+      y_axis_label: Latency
+      type: COUNTER
+      unit: NANOSECONDS
+      aggregation: AVG
+      derivative: NON_NEGATIVE_DERIVATIVE
     - name: storage.iterator.category-crdb-unknown.block-load.bytes
       exported_name: storage_iterator_category_crdb_unknown_block_load_bytes
       description: Bytes loaded by storage sstable iterators (possibly cached).

pkg/cli/debug_check_store.go

@@ -125,7 +125,7 @@ func worker(ctx context.Context, in checkInput) checkResult {
 		res.err = err
 		return res
 	}
-	ms, err := rditer.ComputeStatsForRange(ctx, desc, eng, claimedMS.LastUpdateNanos)
+	ms, err := rditer.ComputeStatsForRange(ctx, desc, eng, fs.UnknownReadCategory, claimedMS.LastUpdateNanos)
 	if err != nil {
 		res.err = err
 		return res

pkg/kv/kvserver/batcheval/cmd_clear_range.go

@@ -189,7 +189,7 @@ func computeStatsDelta(
 	// If we can't use the fast stats path, or race test is enabled, compute stats
 	// across the key span to be cleared.
 	if !entireRange || util.RaceEnabled {
-		computed, err := storage.ComputeStats(ctx, reader, from, to, delta.LastUpdateNanos)
+		computed, err := storage.ComputeStats(ctx, reader, fs.BatchEvalReadCategory, from, to, delta.LastUpdateNanos)
 		if err != nil {
 			return enginepb.MVCCStats{}, err
 		}

pkg/kv/kvserver/batcheval/cmd_delete_range_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
+	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/storage/mvccencoding"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -411,7 +412,7 @@ func computeStats(
 	if len(to) == 0 {
 		to = keys.MaxKey
 	}
-	ms, err := storage.ComputeStats(context.Background(), reader, from, to, nowNanos)
+	ms, err := storage.ComputeStats(t.Context(), reader, fs.UnknownReadCategory, from, to, nowNanos)
 	require.NoError(t, err)
 	return ms
 }

pkg/kv/kvserver/batcheval/cmd_end_transaction.go

@@ -1292,7 +1292,7 @@ func makeScanStatsFn(
 		computeStatsFn = rditer.ComputeStatsForRangeExcludingUser
 	}
 	return func() (enginepb.MVCCStats, error) {
-		sideMS, err := computeStatsFn(ctx, sideDesc, reader, ts.WallTime)
+		sideMS, err := computeStatsFn(ctx, sideDesc, reader, fs.BatchEvalReadCategory, ts.WallTime)
 		if err != nil {
 			return enginepb.MVCCStats{}, errors.Wrapf(err,
 				"unable to compute stats for %s range after split", sideName)

pkg/kv/kvserver/batcheval/cmd_recompute_stats.go

@@ -18,6 +18,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
+	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/util/uuid"
 	"github.com/cockroachdb/errors"
 )
@@ -75,7 +76,8 @@ func RecomputeStats(
 
 	args = nil // avoid accidental use below
 
-	actualMS, err := rditer.ComputeStatsForRange(ctx, desc, reader, cArgs.Header.Timestamp.WallTime)
+	actualMS, err := rditer.ComputeStatsForRange(ctx, desc, reader,
+		fs.BatchEvalReadCategory, cArgs.Header.Timestamp.WallTime)
 	if err != nil {
 		return result.Result{}, err
 	}

pkg/kv/kvserver/batcheval/cmd_revert_range_test.go

@@ -119,7 +119,8 @@ func TestCmdRevertRange(t *testing.T) {
 		Stats:           stats,
 	}
 	cArgs.EvalCtx = evalCtx.EvalContext()
-	afterStats, err := storage.ComputeStats(ctx, eng, keys.LocalMax, keys.MaxKey, 0)
+	afterStats, err := storage.ComputeStats(ctx, eng, fs.BatchEvalReadCategory,
+		keys.LocalMax, keys.MaxKey, 0)
 	require.NoError(t, err)
 	for _, tc := range []struct {
 		name     string
@@ -174,7 +175,8 @@ func TestCmdRevertRange(t *testing.T) {
 			}
 			evalStats := afterStats
 			evalStats.Add(*cArgs.Stats)
-			realStats, err := storage.ComputeStats(ctx, batch, keys.LocalMax, keys.MaxKey, evalStats.LastUpdateNanos)
+			realStats, err := storage.ComputeStats(ctx, batch, fs.BatchEvalReadCategory,
+				keys.LocalMax, keys.MaxKey, evalStats.LastUpdateNanos)
 			require.NoError(t, err)
 			require.Equal(t, realStats, evalStats)
 		})

pkg/kv/kvserver/batcheval/cmd_subsume.go

@@ -231,7 +231,8 @@ func Subsume(
 	// rather than introducing additional synchronization complexity.
 	ridPrefix := keys.MakeRangeIDReplicatedPrefix(desc.RangeID)
 	reply.RangeIDLocalMVCCStats, err = storage.ComputeStats(
-		ctx, readWriter, ridPrefix, ridPrefix.PrefixEnd(), 0 /* nowNanos */)
+		ctx, readWriter, fs.BatchEvalReadCategory,
+		ridPrefix, ridPrefix.PrefixEnd(), 0 /* nowNanos */)
 	if err != nil {
 		return result.Result{}, err
 	}

pkg/kv/kvserver/batcheval/cmd_truncate_log.go

@@ -17,6 +17,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
+	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
 )
@@ -128,7 +129,8 @@ func TruncateLog(
 	// are not tracked in the raft log delta. The delta will be adjusted below
 	// raft.
 	// We can pass zero as nowNanos because we're only interested in SysBytes.
-	ms, err := storage.ComputeStats(ctx, logReader, start, end, 0 /* nowNanos */)
+	ms, err := storage.ComputeStats(ctx, logReader, fs.ReplicationReadCategory,
+		start, end, 0 /* nowNanos */)
 	if err != nil {
 		return result.Result{}, errors.Wrap(err, "while computing stats of Raft log freed by truncation")
 	}

pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage"
+	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -123,13 +124,13 @@ func TestTruncateLog(t *testing.T) {
 	// Verify the stats match what's actually in the log engine.
 	start := keys.RaftLogKey(rangeID, compactedIndex+1)
 	end := keys.RaftLogKey(rangeID, compactedIndex+8)
-	expectedStats, err := storage.ComputeStats(ctx, logEng, start, end, 0)
+	expectedStats, err := storage.ComputeStats(ctx, logEng, fs.ReplicationReadCategory, start, end, 0)
 	require.NoError(t, err)
 	assert.Equal(t, -expectedStats.SysBytes, res.Replicated.RaftLogDelta,
 		"RaftLogDelta should match stats computed from log engine")
 
 	// The state machine engine's stats should be zero.
-	zeroStats, err := storage.ComputeStats(ctx, stateEng, start, end, 0)
+	zeroStats, err := storage.ComputeStats(ctx, stateEng, fs.UnknownReadCategory, start, end, 0)
 	require.NoError(t, err)
 	require.Zero(t, zeroStats.SysBytes)
 }