From 1b288fe1b68f659799081c2d6d3360a41778812b Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Thu, 26 Dec 2019 04:14:53 -0500 Subject: [PATCH] mds: print the METRIC_TYPE for debug info It is hard to distinguish which payload it will be without the METRIC_TYPE, for example: 20 handle_payload: mds.metrics: session=0x5639299cdf80, hits=7527, misses=693 20 handle_payload: mds.metrics: session=0x5639299cdf80, hits=2285, misses=120 Fixes: https://tracker.ceph.com/issues/47844 Signed-off-by: Xiubo Li --- src/mds/MetricsHandler.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc index 6ce76cc23a9b7..3cec99ce8780c 100644 --- a/src/mds/MetricsHandler.cc +++ b/src/mds/MetricsHandler.cc @@ -140,8 +140,9 @@ void MetricsHandler::reset_seq() { } void MetricsHandler::handle_payload(Session *session, const CapInfoPayload &payload) { - dout(20) << ": session=" << session << ", hits=" << payload.cap_hits << ", misses=" - << payload.cap_misses << dendl; + dout(20) << ": type=" << static_cast(CapInfoPayload::METRIC_TYPE) + << ", session=" << session << ", hits=" << payload.cap_hits << ", misses=" + << payload.cap_misses << dendl; auto it = client_metrics_map.find(session->info.inst); if (it == client_metrics_map.end()) { @@ -155,7 +156,8 @@ void MetricsHandler::handle_payload(Session *session, const CapInfoPayload &payl } void MetricsHandler::handle_payload(Session *session, const ReadLatencyPayload &payload) { - dout(20) << ": session=" << session << ", latency=" << payload.lat << dendl; + dout(20) << ": type=" << static_cast(ReadLatencyPayload::METRIC_TYPE) + << ", session=" << session << ", latency=" << payload.lat << dendl; auto it = client_metrics_map.find(session->info.inst); if (it == client_metrics_map.end()) { @@ -169,7 +171,8 @@ void MetricsHandler::handle_payload(Session *session, const ReadLatencyPayload & } void MetricsHandler::handle_payload(Session *session, const WriteLatencyPayload &payload) { - dout(20) << ": session=" << session << ", latency=" << payload.lat << dendl; + dout(20) << ": type=" << static_cast(WriteLatencyPayload::METRIC_TYPE) + << ", session=" << session << ", latency=" << payload.lat << dendl; auto it = client_metrics_map.find(session->info.inst); if (it == client_metrics_map.end()) { @@ -183,7 +186,8 @@ void MetricsHandler::handle_payload(Session *session, const WriteLatencyPayload } void MetricsHandler::handle_payload(Session *session, const MetadataLatencyPayload &payload) { - dout(20) << ": session=" << session << ", latency=" << payload.lat << dendl; + dout(20) << ": type=" << static_cast(MetadataLatencyPayload::METRIC_TYPE) + << ", session=" << session << ", latenc]y=" << payload.lat << dendl; auto it = client_metrics_map.find(session->info.inst); if (it == client_metrics_map.end()) { @@ -197,7 +201,7 @@ void MetricsHandler::handle_payload(Session *session, const MetadataLatencyPaylo } void MetricsHandler::handle_payload(Session *session, const UnknownPayload &payload) { - dout(5) << ": session=" << session << ", ignoring unknown payload" << dendl; + dout(5) << ": type=Unknown, session=" << session << ", ignoring unknown payload" << dendl; } void MetricsHandler::handle_client_metrics(const cref_t &m) { -- 2.39.5