kvserver: rename ReplicateQueueDroppedDueToSize to ReplicateQueueFull

This commit improves the clarity around the naming and description of the
metrics.

Author: wenyihu6

docs/generated/metrics/metrics.yaml

@@ -13903,14 +13903,6 @@ layers:
       unit: COUNT
       aggregation: AVG
       derivative: NON_NEGATIVE_DERIVATIVE
-    - name: queue.replicate.dropped_due_to_size
-      exported_name: queue_replicate_dropped_due_to_size
-      description: Number of replicas dropped due to the replicate queue exceeding its max size
-      y_axis_label: Replicas
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
     - name: queue.replicate.nonvoterpromotions
       exported_name: queue_replicate_nonvoterpromotions
       description: Number of non-voters promoted to voters by the replicate queue
@@ -13959,6 +13951,14 @@ layers:
       unit: COUNT
       aggregation: AVG
       derivative: NONE
+    - name: queue.replicate.queue_full
+      exported_name: queue_replicate_queue_full
+      description: Number of times a replica was dropped from the queue due to queue fullness
+      y_axis_label: Replicas
+      type: COUNTER
+      unit: COUNT
+      aggregation: AVG
+      derivative: NON_NEGATIVE_DERIVATIVE
     - name: queue.replicate.rebalancenonvoterreplica
       exported_name: queue_replicate_rebalancenonvoterreplica
       description: Number of non-voter replica rebalancer-initiated additions attempted by the replicate queue

pkg/kv/kvserver/metrics.go

@@ -2192,9 +2192,9 @@ The messages are dropped to help these replicas to recover from I/O overload.`,
 		Measurement: "Replicas",
 		Unit:        metric.Unit_COUNT,
 	}
-	metaReplicateQueueDroppedDueToSize = metric.Metadata{
-		Name:        "queue.replicate.dropped_due_to_size",
-		Help:        "Number of replicas dropped due to the replicate queue exceeding its max size",
+	metaReplicateQueueFull = metric.Metadata{
+		Name:        "queue.replicate.queue_full",
+		Help:        "Number of times a replica was dropped from the queue due to queue fullness",
 		Measurement: "Replicas",
 		Unit:        metric.Unit_COUNT,
 	}
@@ -3191,7 +3191,7 @@ type StoreMetrics struct {
 	ReplicateQueueSuccesses                   *metric.Counter
 	ReplicateQueueFailures                    *metric.Counter
 	ReplicateQueuePending                     *metric.Gauge
-	ReplicateQueueDroppedDueToSize            *metric.Counter
+	ReplicateQueueFull                        *metric.Counter
 	ReplicateQueueProcessingNanos             *metric.Counter
 	ReplicateQueuePurgatory                   *metric.Gauge
 	SplitQueueSuccesses                       *metric.Counter
@@ -3981,7 +3981,7 @@ func newStoreMetrics(histogramWindow time.Duration) *StoreMetrics {
 		ReplicateQueueSuccesses:                   metric.NewCounter(metaReplicateQueueSuccesses),
 		ReplicateQueueFailures:                    metric.NewCounter(metaReplicateQueueFailures),
 		ReplicateQueuePending:                     metric.NewGauge(metaReplicateQueuePending),
-		ReplicateQueueDroppedDueToSize:            metric.NewCounter(metaReplicateQueueDroppedDueToSize),
+		ReplicateQueueFull:                        metric.NewCounter(metaReplicateQueueFull),
 		ReplicateQueueProcessingNanos:             metric.NewCounter(metaReplicateQueueProcessingNanos),
 		ReplicateQueuePurgatory:                   metric.NewGauge(metaReplicateQueuePurgatory),
 		SplitQueueSuccesses:                       metric.NewCounter(metaSplitQueueSuccesses),

pkg/kv/kvserver/queue.go

@@ -331,11 +331,11 @@ type queueConfig struct {
 	failures *metric.Counter
 	// pending is a gauge measuring current replica count pending.
 	pending *metric.Gauge
-	// droppedDueToSize is a counter measuring replicas dropped due to
-	// exceeding the queue max size.
+	// full is a counter measuring replicas dropped due to exceeding the queue max
+	// size.
 	// NB: this metric may be nil for queues that are not interested in tracking
 	// this.
-	droppedDueToSize *metric.Counter
+	full *metric.Counter
 	// processingNanos is a counter measuring total nanoseconds spent processing
 	// replicas.
 	processingNanos *metric.Counter
@@ -556,7 +556,7 @@ func (bq *baseQueue) SetMaxSize(maxSize int64) {
 	// queue. To be safe, however, we use removeLocked.
 	for int64(bq.mu.priorityQ.Len()) > maxSize {
 		pqLen := bq.mu.priorityQ.Len()
-		bq.droppedDueToSize.Inc(1)
+		bq.full.Inc(1)
 		bq.removeLocked(bq.mu.priorityQ.sl[pqLen-1])
 	}
 }
@@ -798,8 +798,8 @@ func (bq *baseQueue) addInternal(
 	// scan.
 	if pqLen := bq.mu.priorityQ.Len(); int64(pqLen) > bq.mu.maxSize {
 		replicaItemToDrop := bq.mu.priorityQ.sl[pqLen-1]
-		if bq.droppedDueToSize != nil {
-			bq.droppedDueToSize.Inc(1)
+		if bq.full != nil {
+			bq.full.Inc(1)
 		}
 		log.Dev.VInfof(ctx, 1, "dropping due to exceeding queue max size: priority=%0.3f, replica=%v",
 			priority, replicaItemToDrop.replicaID)

pkg/kv/kvserver/replicate_queue.go

@@ -598,7 +598,7 @@ func newReplicateQueue(store *Store, allocator allocatorimpl.Allocator) *replica
 			successes:          store.metrics.ReplicateQueueSuccesses,
 			failures:           store.metrics.ReplicateQueueFailures,
 			pending:            store.metrics.ReplicateQueuePending,
-			droppedDueToSize:   store.metrics.ReplicateQueueDroppedDueToSize,
+			full:               store.metrics.ReplicateQueueFull,
 			processingNanos:    store.metrics.ReplicateQueueProcessingNanos,
 			purgatory:          store.metrics.ReplicateQueuePurgatory,
 			disabledConfig:     kvserverbase.ReplicateQueueEnabled,

pkg/kv/kvserver/store_rebalancer_test.go

@@ -1888,8 +1888,8 @@ func TestReplicateQueueMaxSize(t *testing.T) {
 	// Helper function to add a replica and verify queue state.
 	verify := func(expectedLength int, expectedDropped int64) {
 		require.Equal(t, expectedLength, replicateQueue.Length())
-		require.Equal(t, expectedDropped, replicateQueue.droppedDueToSize.Count())
-		require.Equal(t, expectedDropped, tc.store.metrics.ReplicateQueueDroppedDueToSize.Count())
+		require.Equal(t, expectedDropped, replicateQueue.full.Count())
+		require.Equal(t, expectedDropped, tc.store.metrics.ReplicateQueueFull.Count())
 	}
 
 	addReplicaAndVerify := func(rangeID roachpb.RangeID, expectedLength int, expectedDropped int64) {