Merge pull request #5939 from NyaliaLui/readers-probe-clear

storage: add metrics clear to reader cache probe
redpanda-data · Aug 11, 2022 · a38aa4f · a38aa4f
2 parents 7b465d0 + 9bd1c45
commit a38aa4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/v/storage/readers_cache.cc b/src/v/storage/readers_cache.cc
@@ -171,6 +171,12 @@ ss::future<> readers_cache::stop() {
     _readers.clear_and_dispose([](entry* e) {
         delete e; // NOLINT
     });
+    /**
+     * Stop and clear metrics as well or risk a double registrion on partition
+     * movements. For details see
+     * https://github.com/redpanda-data/redpanda/issues/5938
+     */
+    _probe.clear();
 }
 
 ss::future<readers_cache::range_lock_holder>

diff --git a/src/v/storage/readers_cache_probe.h b/src/v/storage/readers_cache_probe.h
@@ -14,6 +14,7 @@ class readers_cache_probe {
     void reader_evicted() { _readers_evicted++; }
     void cache_hit() { _cache_hits++; }
     void cache_miss() { _cache_misses++; }
+    void clear() { _metrics.clear(); }
 
     void setup_metrics(const model::ntp& ntp);