From: John Spray <john.spray@redhat.com>
Date: Thu, 10 Nov 2016 15:19:19 +0000 (+0000)
Subject: mds: add a performance counter for dirfrag merge
X-Git-Tag: v11.1.0~137^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aef133d5535b2c7dcd444f8a83cd314c95130bfe;p=ceph.git

mds: add a performance counter for dirfrag merge

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

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index acb50fcd96af2..b67a918b404e7 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1005,6 +1005,8 @@ void CDir::merge(list<CDir*>& subs, list<MDSInternalContextBase*>& waiters, bool
 {
   dout(10) << "merge " << subs << dendl;
 
+  if (cache->mds->logger) cache->mds->logger->inc(l_mds_dir_merge);
+
   set_dir_auth(subs.front()->get_dir_auth());
   prepare_new_fragment(replay);
 
diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 41ad61406f339..88359db69da7a 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -2332,6 +2332,7 @@ void MDSRank::create_logger()
     mds_plb.add_u64_counter(l_mds_dir_fetch, "dir_fetch", "Directory fetch");
     mds_plb.add_u64_counter(l_mds_dir_commit, "dir_commit", "Directory commit");
     mds_plb.add_u64_counter(l_mds_dir_split, "dir_split", "Directory split");
+    mds_plb.add_u64_counter(l_mds_dir_merge, "dir_merge", "Directory merge");
 
     mds_plb.add_u64(l_mds_inode_max, "inode_max", "Max inodes, cache size");
     mds_plb.add_u64(l_mds_inodes, "inodes", "Inodes", "inos");
diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index 9eeb5ff6abf28..190592eabf5d9 100644
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -43,6 +43,7 @@ enum {
   l_mds_dir_fetch,
   l_mds_dir_commit,
   l_mds_dir_split,
+  l_mds_dir_merge,
   l_mds_inode_max,
   l_mds_inodes,
   l_mds_inodes_top,