From 35238d41360a22e22fae7d8ceddf3a2a047e5464 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 27 May 2021 15:49:05 +0300 Subject: [PATCH] common/PriorityCache: low perf counters priorities for submodules. Having too many perf counters with nicknames priorities >= PRIO_INTERESTING spoils daemonperf output and causes no "osd" section there due to presumably too many columns. Fixes: https://tracker.ceph.com/issues/51002 Signed-off-by: Igor Fedotov --- src/common/PriorityCache.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/PriorityCache.cc b/src/common/PriorityCache.cc index 40ca98faba600..dcfc02d4b0fa4 100644 --- a/src/common/PriorityCache.cc +++ b/src/common/PriorityCache.cc @@ -176,59 +176,59 @@ namespace PriorityCache b.add_u64(cur_index + Priority::PRI0, "pri0_bytes", "bytes allocated to pri0", "p0", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI1, "pri1_bytes", "bytes allocated to pri1", "p1", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI2, "pri2_bytes", "bytes allocated to pri2", "p2", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI3, "pri3_bytes", "bytes allocated to pri3", "p3", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI4, "pri4_bytes", "bytes allocated to pri4", "p4", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI5, "pri5_bytes", "bytes allocated to pri5", "p5", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI6, "pri6_bytes", "bytes allocated to pri6", "p6", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI7, "pri7_bytes", "bytes allocated to pri7", "p7", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI8, "pri8_bytes", "bytes allocated to pri8", "p8", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI9, "pri9_bytes", "bytes allocated to pri9", "p9", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI10, "pri10_bytes", "bytes allocated to pri10", "p10", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Priority::PRI11, "pri11_bytes", "bytes allocated to pri11", "p11", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Extra::E_RESERVED, "reserved_bytes", "bytes reserved for future growth.", "r", - PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(cur_index + Extra::E_COMMITTED, "committed_bytes", "total bytes committed,", "c", - PerfCountersBuilder::PRIO_CRITICAL, unit_t(UNIT_BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); for (int i = 0; i < Extra::E_LAST+1; i++) { indexes[name][i] = cur_index + i; -- 2.39.5