mds: rename a bunch of metrics

Also clean out a few that were unused and some dead code.

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

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 12179af84200641265567a0b367e04d601f20d48..133ef0adc54093261fca1dc85ae37a199f5847ac 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -834,7 +834,7 @@ void CDir::split(int bits, list<CDir*>& subs, list<Context*>& waiters, bool repl
 {
   dout(10) << "split by " << bits << " bits on " << *this << dendl;
 
-  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_sp);
+  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_split);
 
   assert(replay || is_complete() || !is_auth());
 
@@ -1337,7 +1337,7 @@ void CDir::fetch(Context *c, const string& want_dn, bool ignore_authpinnability)
   auth_pin(this);
   state_set(CDir::STATE_FETCHING);
 
-  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_f);
+  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_fetch);
 
   _omap_fetch(want_dn);
 }
@@ -1944,9 +1944,9 @@ void CDir::_commit(version_t want, int op_prio)
     state_set(STATE_COMMITTING);
   }
   
-  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_c);
+  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_commit);
 
-   _omap_commit(op_prio);
+  _omap_commit(op_prio);
 }
 
 

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 46f18dc76fdf7f87fe04e1c8dc4e1befe7c1cbf7..15d6b7185eca3266ab50ee3121b8a5d32fc9202e 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -183,14 +183,14 @@ MDCache::~MDCache()
 
 void MDCache::log_stat()
 {
-  mds->logger->set(l_mds_imax, g_conf->mds_cache_size);
-  mds->logger->set(l_mds_i, lru.lru_get_size());
-  mds->logger->set(l_mds_ipin, lru.lru_get_num_pinned());
-  mds->logger->set(l_mds_itop, lru.lru_get_top());
-  mds->logger->set(l_mds_ibot, lru.lru_get_bot());
-  mds->logger->set(l_mds_iptail, lru.lru_get_pintail());
-  mds->logger->set(l_mds_icap, num_inodes_with_caps);
-  mds->logger->set(l_mds_cap, num_caps);
+  mds->logger->set(l_mds_inode_max, g_conf->mds_cache_size);
+  mds->logger->set(l_mds_inodes, lru.lru_get_size());
+  mds->logger->set(l_mds_inodes_pinned, lru.lru_get_num_pinned());
+  mds->logger->set(l_mds_inodes_top, lru.lru_get_top());
+  mds->logger->set(l_mds_inodes_bottom, lru.lru_get_bot());
+  mds->logger->set(l_mds_inodes_pin_tail, lru.lru_get_pintail());
+  mds->logger->set(l_mds_inodes_with_caps, num_inodes_with_caps);
+  mds->logger->set(l_mds_caps, num_caps);
 }
 
 
@@ -6260,7 +6260,7 @@ bool MDCache::trim_dentry(CDentry *dn, map<int, MCacheExpire*>& expiremap)
   if (dir->get_num_head_items() == 0 && dir->is_subtree_root())
     migrator->export_empty_import(dir);
   
-  if (mds->logger) mds->logger->inc(l_mds_iex);
+  if (mds->logger) mds->logger->inc(l_mds_inodes_expired);
   return false;
 }
 
@@ -7385,7 +7385,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
 
   client_t client = (mdr && mdr->reqid.name.is_client()) ? mdr->reqid.name.num() : -1;
 
-  if (mds->logger) mds->logger->inc(l_mds_t);
+  if (mds->logger) mds->logger->inc(l_mds_traverse);
 
   dout(7) << "traverse: opening base ino " << path.get_ino() << " snap " << snapid << dendl;
   CInode *cur = get_inode(path.get_ino());
@@ -7458,7 +7458,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
        dout(10) << "traverse: need dirfrag " << fg << ", doing discover from " << *cur << dendl;
        discover_path(cur, snapid, path.postfixpath(depth), _get_waiter(mdr, req, fin),
                      null_okay);
-       if (mds->logger) mds->logger->inc(l_mds_tdis);
+       if (mds->logger) mds->logger->inc(l_mds_traverse_discover);
         return 1;
       }
     }
@@ -7520,7 +7520,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
        (dnl->is_null() || forward)) {
       dout(10) << "traverse: xlocked dentry at " << *dn << dendl;
       dn->lock.add_waiter(SimpleLock::WAIT_RD, _get_waiter(mdr, req, fin));
-      if (mds->logger) mds->logger->inc(l_mds_tlock);
+      if (mds->logger) mds->logger->inc(l_mds_traverse_lock);
       mds->mdlog->flush();
       return 1;
     }
@@ -7554,7 +7554,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
          assert(mdr);  // we shouldn't hit non-primary dentries doing a non-mdr traversal!
           open_remote_dentry(dn, true, _get_waiter(mdr, req, fin),
                             (null_okay && depth == path.depth() - 1));
-         if (mds->logger) mds->logger->inc(l_mds_trino);
+         if (mds->logger) mds->logger->inc(l_mds_traverse_remote_ino);
           return 1;
         }        
       }
@@ -7642,7 +7642,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
         dout(7) << "traverse: incomplete dir contents for " << *cur << ", fetching" << dendl;
         touch_inode(cur);
         curdir->fetch(_get_waiter(mdr, req, fin), path[depth]);
-       if (mds->logger) mds->logger->inc(l_mds_tdirf);
+       if (mds->logger) mds->logger->inc(l_mds_traverse_dir_fetch);
         return 1;
       }
     } else {
@@ -7662,7 +7662,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
        dout(7) << "traverse: discover from " << path[depth] << " from " << *curdir << dendl;
        discover_path(curdir, snapid, path.postfixpath(depth), _get_waiter(mdr, req, fin),
                      null_okay);
-       if (mds->logger) mds->logger->inc(l_mds_tdis);
+       if (mds->logger) mds->logger->inc(l_mds_traverse_discover);
         return 1;
       } 
       if (forward) {
@@ -7693,7 +7693,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
        else
          mds->forward_message_mds(req, dauth.first);
        
-       if (mds->logger) mds->logger->inc(l_mds_tfw);
+       if (mds->logger) mds->logger->inc(l_mds_traverse_forward);
        assert(fin == NULL);
        return 2;
       }    
@@ -7703,7 +7703,7 @@ int MDCache::path_traverse(MDRequestRef& mdr, Message *req, Context *fin,     //
   }
   
   // success.
-  if (mds->logger) mds->logger->inc(l_mds_thit);
+  if (mds->logger) mds->logger->inc(l_mds_traverse_hit);
   dout(10) << "path_traverse finish on snapid " << snapid << dendl;
   if (mdr) 
     assert(mdr->snapid == snapid);
@@ -8621,7 +8621,7 @@ void MDCache::request_forward(MDRequestRef& mdr, int who, int port)
             << *mdr->client_request << dendl;
     mds->forward_message_mds(mdr->client_request, who);
     mdr->client_request = 0;
-    if (mds->logger) mds->logger->inc(l_mds_fw);
+    if (mds->logger) mds->logger->inc(l_mds_forward);
   } else {
     dout(7) << "request_forward drop " << *mdr << " req " << *mdr->client_request
             << " was from mds" << dendl;

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 06b8ce14414ae9b24348553852d706def4f1c825..f2b1e84dacca5858a9d7826b7766dcab41f63966 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -343,61 +343,41 @@ 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");
+    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_replyl, "replyl");
-    mds_plb.add_u64_counter(l_mds_fw, "fw");
+    mds_plb.add_time_avg(l_mds_reply_latency, "reply_latency");
+    mds_plb.add_u64_counter(l_mds_forward, "forward");
     
-    mds_plb.add_u64_counter(l_mds_dir_f, "dir_f");
-    mds_plb.add_u64_counter(l_mds_dir_c, "dir_c");
-    mds_plb.add_u64_counter(l_mds_dir_sp, "dir_sp");
-    mds_plb.add_u64_counter(l_mds_dir_ffc, "dir_ffc");
-    //mds_plb.add_u64_counter("mkdir");
-
-    /*
-    mds_plb.add_u64_counter("newin"); // new inodes (pre)loaded
-    mds_plb.add_u64_counter("newt");  // inodes first touched/used
-    mds_plb.add_u64_counter("outt");  // trimmed touched
-    mds_plb.add_u64_counter("outut"); // trimmed untouched (wasted effort)
-    mds_plb.add_fl_avg("oututl"); // avg trim latency for untouched
-
-    mds_plb.add_u64_counter("dirt1");
-    mds_plb.add_u64_counter("dirt2");
-    mds_plb.add_u64_counter("dirt3");
-    mds_plb.add_u64_counter("dirt4");
-    mds_plb.add_u64_counter("dirt5");
-    */
-
-    mds_plb.add_u64(l_mds_imax, "imax");
-    mds_plb.add_u64(l_mds_i, "i");
-    mds_plb.add_u64(l_mds_itop, "itop");
-    mds_plb.add_u64(l_mds_ibot, "ibot");
-    mds_plb.add_u64(l_mds_iptail, "iptail");  
-    mds_plb.add_u64(l_mds_ipin, "ipin");
-    mds_plb.add_u64_counter(l_mds_iex, "iex");
-    mds_plb.add_u64_counter(l_mds_icap, "icap");
-    mds_plb.add_u64_counter(l_mds_cap, "cap");
+    mds_plb.add_u64_counter(l_mds_dir_fetch, "dir_fetch");
+    mds_plb.add_u64_counter(l_mds_dir_commit, "dir_commit");
+    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_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(l_mds_subtrees, "subtrees");
     
-    mds_plb.add_u64_counter(l_mds_dis, "dis"); // FIXME: unused
-
-    mds_plb.add_u64_counter(l_mds_t, "t"); 
-    mds_plb.add_u64_counter(l_mds_thit, "thit");
-    mds_plb.add_u64_counter(l_mds_tfw, "tfw");
-    mds_plb.add_u64_counter(l_mds_tdis, "tdis");
-    mds_plb.add_u64_counter(l_mds_tdirf, "tdirf");
-    mds_plb.add_u64_counter(l_mds_trino, "trino");
-    mds_plb.add_u64_counter(l_mds_tlock, "tlock");
+    mds_plb.add_u64_counter(l_mds_traverse, "traverse"); 
+    mds_plb.add_u64_counter(l_mds_traverse_hit, "traverse_hit");
+    mds_plb.add_u64_counter(l_mds_traverse_forward, "traverse_forward");
+    mds_plb.add_u64_counter(l_mds_traverse_discover, "traverse_discover");
+    mds_plb.add_u64_counter(l_mds_traverse_dir_fetch, "traverse_dir_fetch");
+    mds_plb.add_u64_counter(l_mds_traverse_remote_ino, "traverse_remote_ino");
+    mds_plb.add_u64_counter(l_mds_traverse_lock, "traverse_lock");
     
-    mds_plb.add_u64(l_mds_l, "l");
-    mds_plb.add_u64(l_mds_q, "q");
-    mds_plb.add_u64(l_mds_popanyd, "popanyd"); // FIXME: unused
-    mds_plb.add_u64(l_mds_popnest, "popnest");
+    mds_plb.add_u64(l_mds_load_cent, "load_cent");
+    mds_plb.add_u64(l_mds_dispatch_queue_len, "q");
     
-    mds_plb.add_u64(l_mds_sm, "sm");
-    mds_plb.add_u64_counter(l_mds_ex, "ex");
-    mds_plb.add_u64_counter(l_mds_iexp, "iexp");
-    mds_plb.add_u64_counter(l_mds_im, "im");
-    mds_plb.add_u64_counter(l_mds_iim, "iim");
+    mds_plb.add_u64_counter(l_mds_exported, "exported");
+    mds_plb.add_u64_counter(l_mds_exported_inodes, "exported_inodes");
+    mds_plb.add_u64_counter(l_mds_imported, "imported");
+    mds_plb.add_u64_counter(l_mds_imported_inodes, "imported_inodes");
     logger = mds_plb.create_perf_counters();
     g_ceph_context->get_perfcounters_collection()->add(logger);
   }
@@ -739,11 +719,11 @@ void MDS::tick()
   mds_load_t load = balancer->get_load(now);
   
   if (logger) {
-    req_rate = logger->get(l_mds_req);
+    req_rate = logger->get(l_mds_request);
     
-    logger->set(l_mds_l, 100 * load.mds_load());
-    logger->set(l_mds_q, messenger->get_dispatch_queue_len());
-    logger->set(l_mds_sm, mdcache->num_subtrees());
+    logger->set(l_mds_load_cent, 100 * load.mds_load());
+    logger->set(l_mds_dispatch_queue_len, messenger->get_dispatch_queue_len());
+    logger->set(l_mds_subtrees, mdcache->num_subtrees());
 
     mdcache->log_stat();
   }

diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 493857a8cb4bd7e4718aea205c1bee9cb74008a4..6164150a81189b12d30c7198e65e4d6e6c92c707 100644 (file)
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -40,40 +40,36 @@
 
 enum {
   l_mds_first = 2000,
-  l_mds_req,
+  l_mds_request,
   l_mds_reply,
-  l_mds_replyl,
-  l_mds_fw,
-  l_mds_dir_f,
-  l_mds_dir_c,
-  l_mds_dir_sp,
-  l_mds_dir_ffc,
-  l_mds_imax,
-  l_mds_i,
-  l_mds_itop,
-  l_mds_ibot,
-  l_mds_iptail,
-  l_mds_ipin,
-  l_mds_iex,
-  l_mds_icap,
-  l_mds_cap,
-  l_mds_dis,
-  l_mds_t,
-  l_mds_thit,
-  l_mds_tfw,
-  l_mds_tdis,
-  l_mds_tdirf,
-  l_mds_trino,
-  l_mds_tlock,
-  l_mds_l,
-  l_mds_q,
-  l_mds_popanyd,
-  l_mds_popnest,
-  l_mds_sm,
-  l_mds_ex,
-  l_mds_iexp,
-  l_mds_im,
-  l_mds_iim,
+  l_mds_reply_latency,
+  l_mds_forward,
+  l_mds_dir_fetch,
+  l_mds_dir_commit,
+  l_mds_dir_split,
+  l_mds_inode_max,
+  l_mds_inodes,
+  l_mds_inodes_top,
+  l_mds_inodes_bottom,
+  l_mds_inodes_pin_tail,
+  l_mds_inodes_pinned,
+  l_mds_inodes_expired,
+  l_mds_inodes_with_caps,
+  l_mds_caps,
+  l_mds_subtrees,
+  l_mds_traverse,
+  l_mds_traverse_hit,
+  l_mds_traverse_forward,
+  l_mds_traverse_discover,
+  l_mds_traverse_dir_fetch,
+  l_mds_traverse_remote_ino,
+  l_mds_traverse_lock,
+  l_mds_load_cent,
+  l_mds_dispatch_queue_len,
+  l_mds_exported,
+  l_mds_exported_inodes,
+  l_mds_imported,
+  l_mds_imported_inodes,
   l_mds_last,
 };
 
@@ -82,6 +78,7 @@ enum {
   l_mdc_last,
 };
 
+// memory utilization
 enum {
   l_mdm_first = 2500,
   l_mdm_ino,

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index f7f137523025e3993f6fa287b56e90c1038a608a..bbd7dbe87b3eab5694346aea815cf13da0366779 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1225,8 +1225,8 @@ void Migrator::export_go_synced(CDir *dir, uint64_t tid)
   assert(g_conf->mds_kill_export_at != 8);
 
   // stats
-  if (mds->logger) mds->logger->inc(l_mds_ex);
-  if (mds->logger) mds->logger->inc(l_mds_iexp, num_exported_inodes);
+  if (mds->logger) mds->logger->inc(l_mds_exported);
+  if (mds->logger) mds->logger->inc(l_mds_exported_inodes, num_exported_inodes);
 
   cache->show_subtrees();
 }
@@ -2256,8 +2256,8 @@ void Migrator::handle_export_dir(MExportDir *m)
 
   // some stats
   if (mds->logger) {
-    mds->logger->inc(l_mds_im);
-    mds->logger->inc(l_mds_iim, num_imported_inodes);
+    mds->logger->inc(l_mds_imported);
+    mds->logger->inc(l_mds_imported_inodes, num_imported_inodes);
   }
 
   m->put();

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index cc97dfb62a89b622a1dd383087995248d14a0df4..d87f406304992f35465c67afe5f2dce528373d66 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -918,7 +918,7 @@ void Server::early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn)
 
   mds->logger->inc(l_mds_reply);
   utime_t lat = ceph_clock_now(g_ceph_context) - mdr->client_request->get_recv_stamp();
-  mds->logger->tinc(l_mds_replyl, lat);
+  mds->logger->tinc(l_mds_reply_latency, lat);
   dout(20) << "lat " << lat << dendl;
 
   mdr->mark_event("early_replied");
@@ -964,7 +964,7 @@ void Server::reply_request(MDRequestRef& mdr, MClientReply *reply, CInode *trace
 
     mds->logger->inc(l_mds_reply);
     utime_t lat = ceph_clock_now(g_ceph_context) - mdr->client_request->get_recv_stamp();
-    mds->logger->tinc(l_mds_replyl, lat);
+    mds->logger->tinc(l_mds_reply_latency, lat);
     dout(20) << "lat " << lat << dendl;
     
     if (tracei)
@@ -1126,7 +1126,7 @@ void Server::handle_client_request(MClientRequest *req)
   dout(4) << "handle_client_request " << *req << dendl;
 
   if (mds->logger)
-    mds->logger->inc(l_mds_req);
+    mds->logger->inc(l_mds_request);
   if (logger)
     logger->inc(l_mdss_hcreq);