kvserver: rename numWriteBytes to numWriteAndIngestedBytes

This commit renames numWriteBytes in appBatchStats to numWriteAndIngestedBytes
for accuracy, as it accounts for both bytes written to the replica and bytes
ingested via SSTables.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/app_batch.go

@@ -33,7 +33,9 @@ type appBatchStats struct {
 	numEntriesProcessedBytes   int64
 	numEmptyEntries            int
 	numAddSST, numAddSSTCopies int
-	numWriteBytes              int64
+	// numWriteAndIngestedBytes is the sum of number of bytes written to the replica and size
+	// of the sstable to ingest.
+	numWriteAndIngestedBytes int64
 
 	// NB: update `merge` when adding a new field.
 }
@@ -43,7 +45,7 @@ func (s *appBatchStats) merge(ss appBatchStats) {
 	s.numEntriesProcessed += ss.numEntriesProcessed
 	s.numEntriesProcessedBytes += ss.numEntriesProcessedBytes
 	ss.numEmptyEntries += ss.numEmptyEntries
-	s.numWriteBytes += ss.numWriteBytes
+	s.numWriteAndIngestedBytes += ss.numWriteAndIngestedBytes
 }
 
 // appBatch is the in-progress foundation for standalone log entry

pkg/kv/kvserver/replica_app_batch.go

@@ -256,7 +256,7 @@ func (b *replicaAppBatch) runPostAddTriggersReplicaOnly(
 	if !cmd.IsLocal() {
 		writeBytes, ingestedBytes := cmd.getStoreWriteByteSizes()
 		if writeBytes > 0 || ingestedBytes > 0 {
-			b.ab.numWriteBytes += writeBytes + ingestedBytes
+			b.ab.numWriteAndIngestedBytes += writeBytes + ingestedBytes
 		}
 		// TODO(irfansharif): This code block can be removed once below-raft
 		// admission control is the only form of IO admission control. It pre-dates
@@ -725,7 +725,7 @@ func (b *replicaAppBatch) recordStatsOnCommit() {
 	b.applyStats.appBatchStats.merge(b.ab.appBatchStats)
 	b.applyStats.numBatchesProcessed++
 	b.applyStats.followerStoreWriteBytes.Merge(b.followerStoreWriteBytes)
-	b.r.recordRequestWriteBytes(b.ab.numWriteBytes)
+	b.r.recordRequestWriteBytes(b.ab.numWriteAndIngestedBytes)
 
 	if n := b.ab.numAddSST; n > 0 {
 		b.r.store.metrics.AddSSTableApplications.Inc(int64(n))

pkg/kv/kvserver/replica_raft.go

@@ -823,7 +823,7 @@ func (s handleRaftReadyStats) SafeFormat(p redact.SafePrinter, _ rune) {
 			p.Printf(" (copies=%d)", c)
 		}
 	}
-	if b := s.apply.numWriteBytes; b > 0 {
+	if b := s.apply.numWriteAndIngestedBytes; b > 0 {
 		p.Printf(", apply-write-bytes=%s", humanizeutil.IBytes(b))
 	}
 	p.SafeString("]")