mds/Server: rename perfcounters

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d87f406304992f35465c67afe5f2dce528373d66..54ce4978b02d5f58f2d94f7f4ee4c45a96566aef 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -74,11 +74,11 @@ using namespace std;
 void Server::create_logger()
 {
   PerfCountersBuilder plb(g_ceph_context, "mds_server", l_mdss_first, l_mdss_last);
-  plb.add_u64_counter(l_mdss_hcreq,"hcreq"); // handle client req
-  plb.add_u64_counter(l_mdss_hsreq, "hsreq"); // slave
-  plb.add_u64_counter(l_mdss_hcsess, "hcsess");    // client session
-  plb.add_u64_counter(l_mdss_dcreq, "dcreq"); // dispatch client req
-  plb.add_u64_counter(l_mdss_dsreq, "dsreq"); // slave
+  plb.add_u64_counter(l_mdss_handle_client_request,"handle_client_request");
+  plb.add_u64_counter(l_mdss_handle_slave_request, "handle_slave_request");
+  plb.add_u64_counter(l_mdss_handle_client_session, "handle_client_session");
+  plb.add_u64_counter(l_mdss_dispatch_client_request, "dispatch_client_request");
+  plb.add_u64_counter(l_mdss_dispatch_slave_request, "dispatch_server_request");
   logger = plb.create_perf_counters();
   g_ceph_context->get_perfcounters_collection()->add(logger);
 }
@@ -191,6 +191,9 @@ void Server::handle_client_session(MClientSession *m)
     return;
   }
 
+  if (logger)
+    logger->inc(l_mdss_handle_client_session);
+
   uint64_t sseq = 0;
   switch (m->get_op()) {
   case CEPH_SESSION_REQUEST_OPEN:
@@ -1128,7 +1131,7 @@ void Server::handle_client_request(MClientRequest *req)
   if (mds->logger)
     mds->logger->inc(l_mds_request);
   if (logger)
-    logger->inc(l_mdss_hcreq);
+    logger->inc(l_mdss_handle_client_request);
 
   if (!mdcache->is_open()) {
     dout(5) << "waiting for root" << dendl;
@@ -1221,7 +1224,7 @@ void Server::dispatch_client_request(MDRequestRef& mdr)
 {
   MClientRequest *req = mdr->client_request;
 
-  if (logger) logger->inc(l_mdss_dcreq);
+  if (logger) logger->inc(l_mdss_dispatch_client_request);
 
   dout(7) << "dispatch_client_request " << *req << dendl;
 
@@ -1343,7 +1346,7 @@ void Server::handle_slave_request(MMDSSlaveRequest *m)
   dout(4) << "handle_slave_request " << m->get_reqid() << " from " << m->get_source() << dendl;
   int from = m->get_source().num();
 
-  if (logger) logger->inc(l_mdss_hsreq);
+  if (logger) logger->inc(l_mdss_handle_slave_request);
 
   // reply?
   if (m->is_reply())
@@ -1535,7 +1538,7 @@ void Server::dispatch_slave_request(MDRequestRef& mdr)
     return;
   }
 
-  if (logger) logger->inc(l_mdss_dsreq);
+  if (logger) logger->inc(l_mdss_dispatch_slave_request);
 
   int op = mdr->slave_request->get_op();
   switch (op) {

diff --git a/src/mds/Server.h b/src/mds/Server.h
index 423089189585379da5e1056dea97c4d21e85a8a0..b285f54e6bf537a277b3f6832aa524f56cb00267 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -31,11 +31,11 @@ typedef ceph::shared_ptr<MDRequestImpl> MDRequestRef;
 
 enum {
   l_mdss_first = 1000,
-  l_mdss_hcreq,
-  l_mdss_hsreq,
-  l_mdss_hcsess,
-  l_mdss_dcreq,
-  l_mdss_dsreq,
+  l_mdss_handle_client_request,
+  l_mdss_handle_slave_request,
+  l_mdss_handle_client_session,
+  l_mdss_dispatch_client_request,
+  l_mdss_dispatch_slave_request,
   l_mdss_last,
 };