From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 19 May 2021 05:18:00 +0000 (-0400)
Subject: client: forward read, write, metadata average latency and stdev
X-Git-Tag: v18.0.0~1295^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b4f210b58571c0d88e5e01b90e6106cd894c3be;p=ceph.git

client: forward read, write, metadata average latency and stdev

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 790c43aaef6..7b861cf9cfb 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -6754,15 +6754,24 @@ void Client::collect_and_send_global_metrics() {
   std::vector<ClientMetricMessage> message;
 
   // read latency
-  metric = ClientMetricMessage(ReadLatencyPayload(logger->tget(l_c_read)));
+  metric = ClientMetricMessage(ReadLatencyPayload(logger->tget(l_c_read),
+                                                  logger->tget(l_c_rd_avg),
+                                                  logger->get(l_c_rd_sqsum),
+                                                  nr_read_request));
   message.push_back(metric);
 
   // write latency
-  metric = ClientMetricMessage(WriteLatencyPayload(logger->tget(l_c_wrlat)));
+  metric = ClientMetricMessage(WriteLatencyPayload(logger->tget(l_c_wrlat),
+                                                   logger->tget(l_c_wr_avg),
+                                                   logger->get(l_c_wr_sqsum),
+                                                   nr_write_request));
   message.push_back(metric);
 
   // metadata latency
-  metric = ClientMetricMessage(MetadataLatencyPayload(logger->tget(l_c_lat)));
+  metric = ClientMetricMessage(MetadataLatencyPayload(logger->tget(l_c_lat),
+                                                      logger->tget(l_c_md_avg),
+                                                      logger->get(l_c_md_sqsum),
+                                                      nr_metadata_request));
   message.push_back(metric);
 
   // cap hit ratio -- nr_caps is unused right now
diff --git a/src/mds/cephfs_features.h b/src/mds/cephfs_features.h
index e934914ba5b..85a636e9b3f 100644
--- a/src/mds/cephfs_features.h
+++ b/src/mds/cephfs_features.h
@@ -73,6 +73,12 @@ namespace ceph {
     CLIENT_METRIC_TYPE_OPENED_INODES,		\
     CLIENT_METRIC_TYPE_READ_IO_SIZES,		\
     CLIENT_METRIC_TYPE_WRITE_IO_SIZES,		\
+    CLIENT_METRIC_TYPE_AVG_READ_LATENCY,	\
+    CLIENT_METRIC_TYPE_STDEV_READ_LATENCY,	\
+    CLIENT_METRIC_TYPE_AVG_WRITE_LATENCY,	\
+    CLIENT_METRIC_TYPE_STDEV_WRITE_LATENCY,	\
+    CLIENT_METRIC_TYPE_AVG_METADATA_LATENCY,	\
+    CLIENT_METRIC_TYPE_STDEV_METADATA_LATENCY,	\
 }
 
 #define CEPHFS_FEATURES_MDS_SUPPORTED CEPHFS_FEATURES_ALL