From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Aug 2014 23:14:55 +0000 (-0700)
Subject: mds: set l_mds_req on client request
X-Git-Tag: v0.86~210^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=31ef1a97814ee1de8cdf707c5baebf8265591d38;p=ceph.git

mds: set l_mds_req on client request

This is one input for the load balancer.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 66995704029..06b8ce14414 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -343,7 +343,7 @@ void MDS::create_logger()
   {
     PerfCountersBuilder mds_plb(g_ceph_context, "mds", l_mds_first, l_mds_last);
 
-    mds_plb.add_u64_counter(l_mds_req, "req"); // FIXME: nobody is actually setting this
+    mds_plb.add_u64_counter(l_mds_req, "req");
     mds_plb.add_u64_counter(l_mds_reply, "reply");
     mds_plb.add_time_avg(l_mds_replyl, "replyl");
     mds_plb.add_u64_counter(l_mds_fw, "fw");
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ec77f81abaa..cc97dfb62a8 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1125,7 +1125,10 @@ void Server::handle_client_request(MClientRequest *req)
 {
   dout(4) << "handle_client_request " << *req << dendl;
 
-  if (logger) logger->inc(l_mdss_hcreq);
+  if (mds->logger)
+    mds->logger->inc(l_mds_req);
+  if (logger)
+    logger->inc(l_mdss_hcreq);
 
   if (!mdcache->is_open()) {
     dout(5) << "waiting for root" << dendl;