From: John Spray <john.spray@redhat.com>
Date: Thu, 17 Nov 2016 23:14:53 +0000 (+0000)
Subject: mds/MDBalancer: remove stale show_imports fn
X-Git-Tag: v11.1.0~137^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8d55b098f785c2dee35441d3ac5e4f5a9c77df6;p=ceph.git

mds/MDBalancer: remove stale show_imports fn

This was just dropping its argument and
calling through to show_subtrees.

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

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 0593fa91885c..5cad10bc5399 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -301,7 +301,7 @@ void MDBalancer::handle_heartbeat(MHeartbeat *m)
     beat_epoch = m->get_beat();
     send_heartbeat();
 
-    show_imports();
+    mds->mdcache->show_subtrees();
   }
 
   {
@@ -545,7 +545,7 @@ void MDBalancer::prep_rebalance(int beat)
     if (my_load < target_load * (1.0 + g_conf->mds_bal_min_rebalance)) {
       dout(5) << "  i am underloaded or barely overloaded, doing nothing." << dendl;
       last_epoch_under = beat_epoch;
-      show_imports();
+      mds->mdcache->show_subtrees();
       return;
     }
 
@@ -762,7 +762,7 @@ void MDBalancer::try_rebalance()
     double have = 0.0;
 
 
-    show_imports();
+    mds->mdcache->show_subtrees();
 
     // search imports from target
     if (import_from_map.count(target)) {
@@ -854,7 +854,7 @@ void MDBalancer::try_rebalance()
   }
 
   dout(5) << "rebalance done" << dendl;
-  show_imports();
+  mds->mdcache->show_subtrees();
 }
 
 
@@ -1193,12 +1193,3 @@ void MDBalancer::add_import(CDir *dir, utime_t now)
   }
 }
 
-
-
-
-
-
-void MDBalancer::show_imports(bool external)
-{
-  mds->mdcache->show_subtrees();
-}
diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h
index c98974de1c58..7c64e750c8c2 100644
--- a/src/mds/MDBalancer.h
+++ b/src/mds/MDBalancer.h
@@ -122,9 +122,6 @@ public:
   void hit_dir(utime_t now, class CDir *dir, int type, int who=-1, double amount=1.0);
   void hit_recursive(utime_t now, class CDir *dir, int type, double amount, double rd_adj);
 
-
-  void show_imports(bool external=false);
-
   void queue_split(CDir *dir);
   void queue_merge(CDir *dir);