Skip to content

Commit aecc555

Browse files
tbgtbg
committed
kvserver: remove unused storage.queue.store-failures metric
This was never incremented. Epic: none Release note (ops change): the `storage.queue.store-failures` metric was removed.
1 parent 1d85eee commit aecc555

14 files changed

+0
-25
lines changed

Diff for: ‎docs/generated/metrics/metrics.html

-1
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@
815815
<tr><td>STORAGE</td><td>storage.l6-level-score</td><td>Compaction score of level 6</td><td>Score</td><td>GAUGE</td><td>COUNT</td><td>AVG</td><td>NONE</td></tr>
816816
<tr><td>STORAGE</td><td>storage.l6-level-size</td><td>Size of the SSTables in level 6</td><td>Bytes</td><td>GAUGE</td><td>BYTES</td><td>AVG</td><td>NONE</td></tr>
817817
<tr><td>STORAGE</td><td>storage.marked-for-compaction-files</td><td>Count of SSTables marked for compaction</td><td>SSTables</td><td>GAUGE</td><td>COUNT</td><td>AVG</td><td>NONE</td></tr>
818-
<tr><td>STORAGE</td><td>storage.queue.store-failures</td><td>Number of replicas which failed processing in replica queues due to retryable store errors</td><td>Replicas</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
819818
<tr><td>STORAGE</td><td>storage.secondary-cache.count</td><td>The count of cache blocks in the secondary cache (not sstable blocks)</td><td>Cache items</td><td>GAUGE</td><td>COUNT</td><td>AVG</td><td>NONE</td></tr>
820819
<tr><td>STORAGE</td><td>storage.secondary-cache.evictions</td><td>The number of times a cache block was evicted from the secondary cache</td><td>Num evictions</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
821820
<tr><td>STORAGE</td><td>storage.secondary-cache.reads-full-hit</td><td>The number of reads where all data returned was read from the secondary cache</td><td>Num reads</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>

Diff for: ‎pkg/kv/kvserver/consistency_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ func newConsistencyQueue(store *Store) *consistencyQueue {
104104
acceptsUnsplitRanges: true,
105105
successes: store.metrics.ConsistencyQueueSuccesses,
106106
failures: store.metrics.ConsistencyQueueFailures,
107-
storeFailures: store.metrics.StoreFailures,
108107
pending: store.metrics.ConsistencyQueuePending,
109108
processingNanos: store.metrics.ConsistencyQueueProcessingNanos,
110109
processTimeoutFunc: makeRateLimitedTimeoutFunc(consistencyCheckRate),

Diff for: ‎pkg/kv/kvserver/merge_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ func newMergeQueue(store *Store, db *kv.DB) *mergeQueue {
125125
acceptsUnsplitRanges: false,
126126
successes: store.metrics.MergeQueueSuccesses,
127127
failures: store.metrics.MergeQueueFailures,
128-
storeFailures: store.metrics.StoreFailures,
129128
pending: store.metrics.MergeQueuePending,
130129
processingNanos: store.metrics.MergeQueueProcessingNanos,
131130
purgatory: store.metrics.MergeQueuePurgatory,

Diff for: ‎pkg/kv/kvserver/metrics.go

-9
Original file line numberDiff line numberDiff line change
@@ -1815,13 +1815,6 @@ The messages are dropped to help these replicas to recover from I/O overload.`,
18151815
Unit: metric.Unit_PERCENT,
18161816
}
18171817

1818-
// Replica queue metrics.
1819-
metaStoreFailures = metric.Metadata{
1820-
Name: "storage.queue.store-failures",
1821-
Help: "Number of replicas which failed processing in replica queues due to retryable store errors",
1822-
Measurement: "Replicas",
1823-
Unit: metric.Unit_COUNT,
1824-
}
18251818
metaMVCCGCQueueSuccesses = metric.Metadata{
18261819
Name: "queue.gc.process.success",
18271820
Help: "Number of replicas successfully processed by the MVCC GC queue",
@@ -2875,7 +2868,6 @@ type StoreMetrics struct {
28752868
RaftCoalescedHeartbeatsPending *metric.Gauge
28762869

28772870
// Replica queue metrics.
2878-
StoreFailures *metric.Counter
28792871
MVCCGCQueueSuccesses *metric.Counter
28802872
MVCCGCQueueFailures *metric.Counter
28812873
MVCCGCQueuePending *metric.Gauge
@@ -3645,7 +3637,6 @@ func newStoreMetrics(histogramWindow time.Duration) *StoreMetrics {
36453637
RaftCoalescedHeartbeatsPending: metric.NewGauge(metaRaftCoalescedHeartbeatsPending),
36463638

36473639
// Replica queue metrics.
3648-
StoreFailures: metric.NewCounter(metaStoreFailures),
36493640
MVCCGCQueueSuccesses: metric.NewCounter(metaMVCCGCQueueSuccesses),
36503641
MVCCGCQueueFailures: metric.NewCounter(metaMVCCGCQueueFailures),
36513642
MVCCGCQueuePending: metric.NewGauge(metaMVCCGCQueuePending),

Diff for: ‎pkg/kv/kvserver/mvcc_gc_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ func newMVCCGCQueue(store *Store) *mvccGCQueue {
199199
},
200200
successes: store.metrics.MVCCGCQueueSuccesses,
201201
failures: store.metrics.MVCCGCQueueFailures,
202-
storeFailures: store.metrics.StoreFailures,
203202
pending: store.metrics.MVCCGCQueuePending,
204203
processingNanos: store.metrics.MVCCGCQueueProcessingNanos,
205204
disabledConfig: kvserverbase.MVCCGCQueueEnabled,

Diff for: ‎pkg/kv/kvserver/queue.go

-4
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@ type queueConfig struct {
329329
successes *metric.Counter
330330
// failures is a counter of replicas which failed processing.
331331
failures *metric.Counter
332-
// storeFailures is a counter of replicas that failed processing due to a
333-
// StoreBenignError. These errors must be counted independently of the above
334-
// failures metric.
335-
storeFailures *metric.Counter
336332
// pending is a gauge measuring current replica count pending.
337333
pending *metric.Gauge
338334
// processingNanos is a counter measuring total nanoseconds spent processing

Diff for: ‎pkg/kv/kvserver/queue_concurrency_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func TestBaseQueueConcurrent(t *testing.T) {
5858
// We don't care about these, but we don't want to crash.
5959
successes: metric.NewCounter(metric.Metadata{Name: "processed"}),
6060
failures: metric.NewCounter(metric.Metadata{Name: "failures"}),
61-
storeFailures: metric.NewCounter(metric.Metadata{Name: "store_failures"}),
6261
pending: metric.NewGauge(metric.Metadata{Name: "pending"}),
6362
processingNanos: metric.NewCounter(metric.Metadata{Name: "processingnanos"}),
6463
purgatory: metric.NewGauge(metric.Metadata{Name: "purgatory"}),

Diff for: ‎pkg/kv/kvserver/queue_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ func makeTestBaseQueue(name string, impl queueImpl, store *Store, cfg queueConfi
107107
}
108108
cfg.successes = metric.NewCounter(metric.Metadata{Name: "processed"})
109109
cfg.failures = metric.NewCounter(metric.Metadata{Name: "failures"})
110-
cfg.storeFailures = metric.NewCounter(metric.Metadata{Name: "store_failures"})
111110
cfg.pending = metric.NewGauge(metric.Metadata{Name: "pending"})
112111
cfg.processingNanos = metric.NewCounter(metric.Metadata{Name: "processingnanos"})
113112
cfg.purgatory = metric.NewGauge(metric.Metadata{Name: "purgatory"})

Diff for: ‎pkg/kv/kvserver/raft_log_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ func newRaftLogQueue(store *Store, db *kv.DB) *raftLogQueue {
175175
acceptsUnsplitRanges: true,
176176
successes: store.metrics.RaftLogQueueSuccesses,
177177
failures: store.metrics.RaftLogQueueFailures,
178-
storeFailures: store.metrics.StoreFailures,
179178
pending: store.metrics.RaftLogQueuePending,
180179
processingNanos: store.metrics.RaftLogQueueProcessingNanos,
181180
disabledConfig: kvserverbase.RaftLogQueueEnabled,

Diff for: ‎pkg/kv/kvserver/raft_snapshot_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func newRaftSnapshotQueue(store *Store) *raftSnapshotQueue {
5151
processTimeoutFunc: makeRateLimitedTimeoutFunc(rebalanceSnapshotRate),
5252
successes: store.metrics.RaftSnapshotQueueSuccesses,
5353
failures: store.metrics.RaftSnapshotQueueFailures,
54-
storeFailures: store.metrics.StoreFailures,
5554
pending: store.metrics.RaftSnapshotQueuePending,
5655
processingNanos: store.metrics.RaftSnapshotQueueProcessingNanos,
5756
disabledConfig: kvserverbase.RaftSnapshotQueueEnabled,

Diff for: ‎pkg/kv/kvserver/replica_gc_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ func newReplicaGCQueue(store *Store, db *kv.DB) *replicaGCQueue {
101101
processDestroyedReplicas: true,
102102
successes: store.metrics.ReplicaGCQueueSuccesses,
103103
failures: store.metrics.ReplicaGCQueueFailures,
104-
storeFailures: store.metrics.StoreFailures,
105104
pending: store.metrics.ReplicaGCQueuePending,
106105
processingNanos: store.metrics.ReplicaGCQueueProcessingNanos,
107106
disabledConfig: kvserverbase.ReplicaGCQueueEnabled,

Diff for: ‎pkg/kv/kvserver/replicate_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ func newReplicateQueue(store *Store, allocator allocatorimpl.Allocator) *replica
572572
processTimeoutFunc: makeRateLimitedTimeoutFunc(rebalanceSnapshotRate),
573573
successes: store.metrics.ReplicateQueueSuccesses,
574574
failures: store.metrics.ReplicateQueueFailures,
575-
storeFailures: store.metrics.StoreFailures,
576575
pending: store.metrics.ReplicateQueuePending,
577576
processingNanos: store.metrics.ReplicateQueueProcessingNanos,
578577
purgatory: store.metrics.ReplicateQueuePurgatory,

Diff for: ‎pkg/kv/kvserver/split_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ func newSplitQueue(store *Store, db *kv.DB) *splitQueue {
134134
acceptsUnsplitRanges: true,
135135
successes: store.metrics.SplitQueueSuccesses,
136136
failures: store.metrics.SplitQueueFailures,
137-
storeFailures: store.metrics.StoreFailures,
138137
pending: store.metrics.SplitQueuePending,
139138
processingNanos: store.metrics.SplitQueueProcessingNanos,
140139
purgatory: store.metrics.SplitQueuePurgatory,

Diff for: ‎pkg/kv/kvserver/ts_maintenance_queue.go

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func newTimeSeriesMaintenanceQueue(
105105
acceptsUnsplitRanges: true,
106106
successes: store.metrics.TimeSeriesMaintenanceQueueSuccesses,
107107
failures: store.metrics.TimeSeriesMaintenanceQueueFailures,
108-
storeFailures: store.metrics.StoreFailures,
109108
pending: store.metrics.TimeSeriesMaintenanceQueuePending,
110109
processingNanos: store.metrics.TimeSeriesMaintenanceQueueProcessingNanos,
111110
disabledConfig: kvserverbase.TimeSeriesMaintenanceQueueEnabled,

0 commit comments

Comments
 (0)