From dedbeba39f7efcba6940766563edaf2abadc0db0 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 3 Jun 2025 16:55:21 +0300 Subject: [PATCH] os/bluestore: remove bluefs max_alloc perf counters New PerfCounters::tinc_save_max() call is used since now. Signed-off-by: Igor Fedotov --- src/os/bluestore/BlueFS.cc | 30 +++--------------------------- src/os/bluestore/BlueFS.h | 5 ----- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index aae63918bf48b..de08397128739 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -457,18 +457,6 @@ void BlueFS::_init_logger() "Average allocation latency for primary/shared device", "bsal", PerfCountersBuilder::PRIO_USEFUL); - b.add_time(l_bluefs_wal_alloc_max_lat, "alloc_wal_max_lat", - "Max allocation latency for wal device", - "awxt", - PerfCountersBuilder::PRIO_INTERESTING); - b.add_time(l_bluefs_db_alloc_max_lat, "alloc_db_max_lat", - "Max allocation latency for db device", - "adxt", - PerfCountersBuilder::PRIO_INTERESTING); - b.add_time(l_bluefs_slow_alloc_max_lat, "alloc_slow_max_lat", - "Max allocation latency for primary/shared device", - "asxt", - PerfCountersBuilder::PRIO_INTERESTING); logger = b.create_perf_counters(); cct->get_perfcounters_collection()->add(logger); @@ -4355,25 +4343,13 @@ void BlueFS::_update_allocate_stats(uint8_t id, const ceph::timespan& d) { switch(id) { case BDEV_SLOW: - logger->tinc(l_bluefs_slow_alloc_lat, d); - if (d > max_alloc_lat[id]) { - logger->tset(l_bluefs_slow_alloc_max_lat, utime_t(d)); - max_alloc_lat[id] = d; - } + logger->tinc_with_max(l_bluefs_slow_alloc_lat, d); break; case BDEV_DB: - logger->tinc(l_bluefs_db_alloc_lat, d); - if (d > max_alloc_lat[id]) { - logger->tset(l_bluefs_db_alloc_max_lat, utime_t(d)); - max_alloc_lat[id] = d; - } + logger->tinc_with_max(l_bluefs_db_alloc_lat, d); break; case BDEV_WAL: - logger->tinc(l_bluefs_wal_alloc_lat, d); - if (d > max_alloc_lat[id]) { - logger->tset(l_bluefs_wal_alloc_max_lat, utime_t(d)); - max_alloc_lat[id] = d; - } + logger->tinc_with_max(l_bluefs_wal_alloc_lat, d); break; } } diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h index 5f8435f425dfc..ac31691086409 100644 --- a/src/os/bluestore/BlueFS.h +++ b/src/os/bluestore/BlueFS.h @@ -86,9 +86,6 @@ enum { l_bluefs_wal_alloc_lat, l_bluefs_db_alloc_lat, l_bluefs_slow_alloc_lat, - l_bluefs_wal_alloc_max_lat, - l_bluefs_db_alloc_max_lat, - l_bluefs_slow_alloc_max_lat, l_bluefs_last, }; @@ -557,8 +554,6 @@ private: l_bluefs_max_bytes_db, }; - ceph::timespan max_alloc_lat[MAX_BDEV] = {ceph::make_timespan(0)}; - // cache struct { ceph::mutex lock = ceph::make_mutex("BlueFS::nodes.lock"); -- 2.39.5