From f86b863aa5afbe826201e304a87bdf835da2796d Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Sun, 9 Sep 2007 22:09:00 +0000
Subject: [PATCH] path traverse stats

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1803 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/mds/MDCache.cc  | 13 +++++++++----
 trunk/ceph/mds/MDS.cc      | 19 +++++++++++++++----
 trunk/ceph/mds/Migrator.cc |  4 ----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/trunk/ceph/mds/MDCache.cc b/trunk/ceph/mds/MDCache.cc
index da0f2d8ee7e68..4f8f2ff4b8856 100644
--- a/trunk/ceph/mds/MDCache.cc
+++ b/trunk/ceph/mds/MDCache.cc
@@ -3696,6 +3696,8 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
     return 1;
   }
 
+  if (mds->logger) mds->logger->inc("t");
+
   // start trace
   trace.clear();
 
@@ -3748,6 +3750,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
 	  dir_discovers[cur->ino()].insert(cur->authority().first);
 	}
 	cur->add_waiter(CInode::WAIT_DIR, _get_waiter(mdr, req));
+	if (mds->logger) mds->logger->inc("tdis");
         return 1;
       }
     }
@@ -3798,6 +3801,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
       if (!noperm && dn->lock.is_xlocked() && dn->lock.get_xlocked_by() != mdr) {
         dout(10) << "traverse: xlocked dentry at " << *dn << dendl;
         dn->lock.add_waiter(SimpleLock::WAIT_RD, _get_waiter(mdr, req));
+	if (mds->logger) mds->logger->inc("tlock");
         return 1;
       }
 
@@ -3813,6 +3817,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
           dout(7) << "remote link to " << dn->get_remote_ino() << ", which i don't have" << dendl;
 	  assert(mdr);  // we shouldn't hit non-primary dentries doing a non-mdr traversal!
           open_remote_ino(dn->get_remote_ino(), mdr, _get_waiter(mdr, req));
+	  if (mds->logger) mds->logger->inc("trino");
           return 1;
         }        
       }
@@ -3905,7 +3910,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
         dout(7) << "traverse: incomplete dir contents for " << *cur << ", fetching" << dendl;
         touch_inode(cur);
         curdir->fetch(_get_waiter(mdr, req));
-	if (mds->logger) mds->logger->inc("cmiss");
+	if (mds->logger) mds->logger->inc("tdirf");
         return 1;
       }
     } else {
@@ -3936,12 +3941,11 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
 					      false,
 					      onfail == MDS_TRAVERSE_DISCOVERXLOCK),
 				dauth.first, MDS_PORT_CACHE);
-          if (mds->logger) mds->logger->inc("dis");
         }
         
         // delay processing of current request.
         curdir->add_dentry_waiter(path[depth], _get_waiter(mdr, req));
-        if (mds->logger) mds->logger->inc("cmiss");
+	if (mds->logger) mds->logger->inc("tdis");
         return 1;
       } 
       if (onfail == MDS_TRAVERSE_FORWARD) {
@@ -3969,7 +3973,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
 	  else
 	    mds->forward_message_mds(req, dauth.first, req->get_dest_port());
 	  
-	  if (mds->logger) mds->logger->inc("fw");
+	  if (mds->logger) mds->logger->inc("tfw");
 	  return 2;
 	}
       }    
@@ -3982,6 +3986,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req,     // who
   }
   
   // success.
+  if (mds->logger) mds->logger->inc("thit");
   return 0;
 }
 
diff --git a/trunk/ceph/mds/MDS.cc b/trunk/ceph/mds/MDS.cc
index 303fdbcf5bf3d..7cc566bfbb2d4 100644
--- a/trunk/ceph/mds/MDS.cc
+++ b/trunk/ceph/mds/MDS.cc
@@ -152,7 +152,6 @@ void MDS::reopen_logger(utime_t start)
     //mds_logtype.add_inc("req");
     mds_logtype.add_inc("reply");
     mds_logtype.add_inc("fw");
-    mds_logtype.add_avg("replyl");
     
     mds_logtype.add_inc("dir_f");
     mds_logtype.add_inc("dir_c");
@@ -165,7 +164,14 @@ void MDS::reopen_logger(utime_t start)
     mds_logtype.add_set("cpin");
     mds_logtype.add_inc("cex");
     mds_logtype.add_inc("dis");
-    mds_logtype.add_inc("cmiss");
+
+    mds_logtype.add_inc("t"); 
+    mds_logtype.add_inc("thit");
+    mds_logtype.add_inc("tfw");
+    mds_logtype.add_inc("tdis");
+    mds_logtype.add_inc("tdirf");
+    mds_logtype.add_inc("trino");
+    mds_logtype.add_inc("tlock");
     
     mds_logtype.add_set("l");
     mds_logtype.add_set("q");
@@ -174,13 +180,18 @@ void MDS::reopen_logger(utime_t start)
     
     mds_logtype.add_set("buf");
     
-    mds_logtype.add_inc("iex");
-    mds_logtype.add_inc("iim");
     mds_logtype.add_inc("ex");
+    mds_logtype.add_inc("iex");
     mds_logtype.add_inc("im");
+    mds_logtype.add_inc("iim");
+    /*
     mds_logtype.add_inc("imex");  
     mds_logtype.add_set("nex");
     mds_logtype.add_set("nim");
+    */
+
+    mds_logtype.add_avg("replyl");
+
   }
  
   if (whoami < 0) return;
diff --git a/trunk/ceph/mds/Migrator.cc b/trunk/ceph/mds/Migrator.cc
index 757acccc9e307..22e19029c6d4d 100644
--- a/trunk/ceph/mds/Migrator.cc
+++ b/trunk/ceph/mds/Migrator.cc
@@ -1263,9 +1263,6 @@ void Migrator::export_finish(CDir *dir)
   mds->queue_waiters(export_finish_waiters[dir]);
   export_finish_waiters.erase(dir);
 
-  // stats
-  //if (mds->logger) mds->logger->set("nex", cache->exports.size());
-
   cache->show_subtrees();
   audit();
 
@@ -1613,7 +1610,6 @@ void Migrator::handle_export_dir(MExportDir *m)
   if (mds->logger) {
     mds->logger->inc("im");
     mds->logger->inc("iim", num_imported_inodes);
-    //mds->logger->set("nim", cache->imports.size());
   }
 
   delete m;
-- 
2.39.5