From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 30 Jan 2019 09:16:36 +0000 (+0530)
Subject: mds: dont print auth trees if they are too many
X-Git-Tag: v15.0.0~201^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13c4152c8b1756a871f817d4b503396b6c9cc81d;p=ceph.git

mds: dont print auth trees if they are too many

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 8347e1b74fe..66c5ffe9f16 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -148,11 +148,25 @@ void MDBalancer::handle_export_pins(void)
     }
   }
 
-  for (auto &cd : mds->mdcache->get_auth_subtrees()) {
+  std::vector<CDir *> authsubs = mds->mdcache->get_auth_subtrees();
+  bool print_auth_subtrees = true;
+
+  if (authsubs.size() > AUTH_TREES_THRESHOLD &&
+      !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
+    dout(15) << "number of auth trees = " << authsubs.size() << "; not "
+		"printing auth trees" << dendl;
+    print_auth_subtrees = false;
+  }
+
+  for (auto &cd : authsubs) {
     mds_rank_t export_pin = cd->inode->get_export_pin();
-    dout(10) << "auth tree " << *cd << " export_pin=" << export_pin << dendl;
+
+    if (print_auth_subtrees) {
+      dout(25) << "auth tree " << *cd << " export_pin=" << export_pin <<
+		  dendl;
+    }
+
     if (export_pin >= 0 && export_pin != mds->get_nodeid()) {
-      dout(10) << "exporting auth subtree " << *cd->inode << " to " << export_pin << dendl;
       mds->mdcache->migrator->export_dir(cd, export_pin);
     }
   }
diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index e89b192d7b2..d69edd679ef 100644
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -82,6 +82,7 @@ public:
 private:
   bool bal_fragment_dirs;
   int64_t bal_fragment_interval;
+  static const unsigned int AUTH_TREES_THRESHOLD = 5;
 
   typedef struct {
     std::map<mds_rank_t, double> targets;