From 5f88f27910f241e1d16685d0eb368a273a61ceb9 Mon Sep 17 00:00:00 2001 From: "yite.gu" Date: Thu, 15 Jun 2023 11:35:23 +0800 Subject: [PATCH] common/TrackedOp: rename and raise prio of slow op perfcounter 1. TrackedOp is a common class, mon and mds alse use it. 2. Set prio level of l_trackedop_slow_op_count to PRIO_USEFUL, we can get change of slow op of daemon from prometheus metrics, it's very interesting Signed-off-by: Yite Gu (cherry picked from commit e1a02841973f75c7302fd5088f5be74266fd15c4) --- src/common/TrackedOp.cc | 2 +- src/common/TrackedOp.h | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc index 32a1ab472a89..02c030e30358 100644 --- a/src/common/TrackedOp.cc +++ b/src/common/TrackedOp.cc @@ -90,7 +90,7 @@ void OpHistory::_insert_delayed(const utime_t& now, TrackedOpRef op) arrived.insert(make_pair(op->get_initiated(), op)); if (opduration >= history_slow_op_threshold.load()) { slow_op.insert(make_pair(op->get_initiated(), op)); - logger->inc(l_osd_slow_op_count); + logger->inc(l_trackedop_slow_op_count); } cleanup(now); } diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h index 477f6c959cb3..aa8aeb5fa9d4 100644 --- a/src/common/TrackedOp.h +++ b/src/common/TrackedOp.h @@ -53,9 +53,9 @@ public: }; enum { - l_osd_slow_op_first = 1000, - l_osd_slow_op_count, - l_osd_slow_op_last, + l_trackedop_slow_op_first = 1000, + l_trackedop_slow_op_count, + l_trackedop_slow_op_last, }; class OpHistory { @@ -76,9 +76,11 @@ class OpHistory { public: OpHistory(CephContext *c) : cct(c), opsvc(this) { - PerfCountersBuilder b(cct, "osd-slow-ops", - l_osd_slow_op_first, l_osd_slow_op_last); - b.add_u64_counter(l_osd_slow_op_count, "slow_ops_count", + PerfCountersBuilder b(cct, "trackedop", + l_trackedop_slow_op_first, l_trackedop_slow_op_last); + b.set_prio_default(PerfCountersBuilder::PRIO_USEFUL); + + b.add_u64_counter(l_trackedop_slow_op_count, "slow_ops_count", "Number of operations taking over ten second"); logger.reset(b.create_perf_counters()); -- 2.47.3