mds: mark stats with nicknames

These are the stats that we would like to appear
in the new perf watch CLI mode.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4370cf7de93aa4268859b461bbd42ffef114d3a4..121efd07a9cb4d419c32d1a49931a680cc656293 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -11849,18 +11849,22 @@ void MDCache::register_perfcounters()
             "mds_cache", l_mdc_first, l_mdc_last);
 
     /* Stray/purge statistics */
-    pcb.add_u64(l_mdc_num_strays, "num_strays");
+    pcb.add_u64(l_mdc_num_strays, "num_strays",
+        "Stray dentries", "stry");
     pcb.add_u64(l_mdc_num_strays_purging, "num_strays_purging");
     pcb.add_u64(l_mdc_num_strays_delayed, "num_strays_delayed");
     pcb.add_u64_counter(l_mdc_strays_created, "strays_created");
-    pcb.add_u64_counter(l_mdc_strays_purged, "strays_purged");
+    pcb.add_u64_counter(l_mdc_strays_purged, "strays_purged",
+        "Stray dentries purged", "purg");
 
     /* Recovery queue statistics */
     pcb.add_u64(l_mdc_num_recovering_processing, "num_recovering_processing");
-    pcb.add_u64(l_mdc_num_recovering_enqueued, "num_recovering_enqueued");
+    pcb.add_u64(l_mdc_num_recovering_enqueued, "num_recovering_enqueued",
+        "Files waiting for recovery", "recy");
     pcb.add_u64(l_mdc_num_recovering_prioritized, "num_recovering_prioritized");
     pcb.add_u64_counter(l_mdc_recovery_started, "recovery_started");
-    pcb.add_u64_counter(l_mdc_recovery_completed, "recovery_completed");
+    pcb.add_u64_counter(l_mdc_recovery_completed, "recovery_completed",
+        "File recoveries completed", "recd");
 
     logger = pcb.create_perf_counters();
     g_ceph_context->get_perfcounters_collection()->add(logger);

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index d8c634ec7ab08fd2aefe28e92e464711333f59dc..ebc474a8081b74eb5e876c5a639e320fc8042d46 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -53,17 +53,20 @@ void MDLog::create_logger()
 {
   PerfCountersBuilder plb(g_ceph_context, "mds_log", l_mdl_first, l_mdl_last);
 
-  plb.add_u64_counter(l_mdl_evadd, "evadd");
+  plb.add_u64_counter(l_mdl_evadd, "evadd",
+      "Events submitted", "subm");
   plb.add_u64_counter(l_mdl_evex, "evex");
   plb.add_u64_counter(l_mdl_evtrm, "evtrm");
-  plb.add_u64(l_mdl_ev, "ev");
+  plb.add_u64(l_mdl_ev, "ev",
+      "Events", "evts");
   plb.add_u64(l_mdl_evexg, "evexg");
   plb.add_u64(l_mdl_evexd, "evexd");
 
   plb.add_u64_counter(l_mdl_segadd, "segadd");
   plb.add_u64_counter(l_mdl_segex, "segex");
   plb.add_u64_counter(l_mdl_segtrm, "segtrm");
-  plb.add_u64(l_mdl_seg, "seg");
+  plb.add_u64(l_mdl_seg, "seg",
+      "Segments", "segs");
   plb.add_u64(l_mdl_segexg, "segexg");
   plb.add_u64(l_mdl_segexd, "segexd");
 

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index d2788a94905eed64494949ede74d18220512af9b..210b9ca7a1d6e8aa3c036d8e67d6855863835380 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -705,7 +705,8 @@ void MDS::create_logger()
 
     mds_plb.add_u64_counter(l_mds_request, "request");
     mds_plb.add_u64_counter(l_mds_reply, "reply");
-    mds_plb.add_time_avg(l_mds_reply_latency, "reply_latency");
+    mds_plb.add_time_avg(l_mds_reply_latency, "reply_latency",
+        "Reply latency", "rlat");
     mds_plb.add_u64_counter(l_mds_forward, "forward");
     
     mds_plb.add_u64_counter(l_mds_dir_fetch, "dir_fetch");
@@ -713,14 +714,14 @@ void MDS::create_logger()
     mds_plb.add_u64_counter(l_mds_dir_split, "dir_split");
 
     mds_plb.add_u64(l_mds_inode_max, "inode_max");
-    mds_plb.add_u64(l_mds_inodes, "inodes");
+    mds_plb.add_u64(l_mds_inodes, "inodes", "Inodes", "inos");
     mds_plb.add_u64(l_mds_inodes_top, "inodes_top");
     mds_plb.add_u64(l_mds_inodes_bottom, "inodes_bottom");
     mds_plb.add_u64(l_mds_inodes_pin_tail, "inodes_pin_tail");  
     mds_plb.add_u64(l_mds_inodes_pinned, "inodes_pinned");
     mds_plb.add_u64_counter(l_mds_inodes_expired, "inodes_expired");
     mds_plb.add_u64_counter(l_mds_inodes_with_caps, "inodes_with_caps");
-    mds_plb.add_u64_counter(l_mds_caps, "caps");
+    mds_plb.add_u64_counter(l_mds_caps, "caps", "Capabilities", "caps");
     mds_plb.add_u64(l_mds_subtrees, "subtrees");
     
     mds_plb.add_u64_counter(l_mds_traverse, "traverse"); 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 846ade3cb0aaa768e4f571865a61b82467bd6733..9777f617ec7e962c18c0f81b3212015f8ea1a6df 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -90,9 +90,12 @@ class ServerContext : public MDSInternalContextBase {
 void Server::create_logger()
 {
   PerfCountersBuilder plb(g_ceph_context, "mds_server", l_mdss_first, l_mdss_last);
-  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_handle_client_request,"handle_client_request",
+      "Client requests", "hcr");
+  plb.add_u64_counter(l_mdss_handle_slave_request, "handle_slave_request",
+      "Slave requests", "hsr");
+  plb.add_u64_counter(l_mdss_handle_client_session, "handle_client_session",
+      "Client session messages", "hcs");
   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();