From 4499e5003d9ee15f0df93411466d68fdc0065011 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Fri, 22 Mar 2024 08:07:07 -0500 Subject: [PATCH] osd/scrub: remove scrbcnt_resrv_timed_out perf counter as the code that updates it, following a reservation timeout, was removed. Signed-off-by: Ronen Friedman (cherry picked from commit 7eb287280e64b48447fe95875debc69e907fb7b7) --- src/osd/osd_perf_counters.cc | 1 - src/osd/osd_perf_counters.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/osd/osd_perf_counters.cc b/src/osd/osd_perf_counters.cc index 30f0ba5316654..db448e640da9c 100644 --- a/src/osd/osd_perf_counters.cc +++ b/src/osd/osd_perf_counters.cc @@ -406,7 +406,6 @@ PerfCounters *build_scrub_labeled_perf(CephContext *cct, std::string label) scrub_perf.add_u64_counter(scrbcnt_resrv_success, "scrub_reservations_completed", "successfully completed reservation processes"); scrub_perf.add_time_avg(scrbcnt_resrv_successful_elapsed, "successful_reservations_elapsed", "time to scrub reservation completion"); scrub_perf.add_u64_counter(scrbcnt_resrv_aborted, "reservation_process_aborted", "scrub reservation was aborted"); - scrub_perf.add_u64_counter(scrbcnt_resrv_timed_out, "reservation_process_timed_out", "scrub reservation timed out"); scrub_perf.add_u64_counter(scrbcnt_resrv_rejected, "reservation_process_failure", "scrub reservation failed due to replica denial"); scrub_perf.add_u64_counter(scrbcnt_resrv_skipped, "reservation_process_skipped", "scrub reservation skipped for high priority scrub"); scrub_perf.add_time_avg(scrbcnt_resrv_failed_elapsed, "failed_reservations_elapsed", "time for scrub reservation to fail"); diff --git a/src/osd/osd_perf_counters.h b/src/osd/osd_perf_counters.h index 00127dd7ff5d2..e008c67bdfad2 100644 --- a/src/osd/osd_perf_counters.h +++ b/src/osd/osd_perf_counters.h @@ -218,8 +218,6 @@ enum { scrbcnt_resrv_successful_elapsed, /// # failed attempt to reserve replicas due to an abort scrbcnt_resrv_aborted, - /// # reservation process timed out - scrbcnt_resrv_timed_out, /// # reservation failed due to a 'rejected' response scrbcnt_resrv_rejected, /// # reservation skipped for high-priority scrubs -- 2.39.5