From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 5 May 2022 02:22:04 +0000 (+0800)
Subject: client: force send global open_files/metadata metrics
X-Git-Tag: v17.2.1~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d96baa73b130fd047d3039c115e2c2aa433d75e4;p=ceph.git

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 <xiubli@redhat.com>
(cherry picked from commit a328d3264a0b64c03cf90c2d39f37c6962fa45cb)

Conflicts:
          src/client/Client.cc
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 0fe541f70b03..37627d2a8118 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -6711,7 +6711,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);
   }
@@ -6733,7 +6734,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);