From 5791511500ef9c7b53c7548fef71dd4f2f1d09c4 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Thu, 5 May 2022 10:22:04 +0800 Subject: [PATCH] client: force send global open_files/metadata metrics This change will fix two missing fixes introduce by commit e9a26c551c763f75a403ff26f6304d5c10f2ca38. Fixes: https://tracker.ceph.com/issues/54411 Signed-off-by: Xiubo Li (cherry picked from commit a328d3264a0b64c03cf90c2d39f37c6962fa45cb) Conflicts: src/client/Client.cc --- src/client/Client.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 34d85a4beccf4..04ed7e03411a5 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -6726,7 +6726,8 @@ void Client::collect_and_send_global_metrics() { } // metadata latency - if (session->mds_metric_flags.test(CLIENT_METRIC_TYPE_METADATA_LATENCY)) { + if (_collect_and_send_global_metrics || + session->mds_metric_flags.test(CLIENT_METRIC_TYPE_METADATA_LATENCY)) { metric = ClientMetricMessage(MetadataLatencyPayload(logger->tget(l_c_lat))); message.push_back(metric); } @@ -6748,7 +6749,8 @@ void Client::collect_and_send_global_metrics() { } // opened files - if (session->mds_metric_flags.test(CLIENT_METRIC_TYPE_OPENED_FILES)) { + if (_collect_and_send_global_metrics || + session->mds_metric_flags.test(CLIENT_METRIC_TYPE_OPENED_FILES)) { auto [opened_files, total_inodes] = get_opened_files_rates(); metric = ClientMetricMessage(OpenedFilesPayload(opened_files, total_inodes)); message.push_back(metric); -- 2.39.5