mds/MDSRank: un-inline methods to reduce header dependencies

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 32e9a8cdfc40d7aa1432d19c9cc97a1201c5d34c..d86aebaafdede5c5c82c98ad183440cc804021ab 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -16,6 +16,7 @@
 #include "osdc/Journaler.h"
 
 #include <typeinfo>
+#include "common/DecayCounter.h"
 #include "common/debug.h"
 #include "common/errno.h"
 #include "common/fair_mutex.h"
@@ -34,6 +35,7 @@
 
 #include "mgr/MgrClient.h"
 
+#include "Beacon.h"
 #include "MDCache.h"
 #include "MDLog.h"
 #include "MDSDaemon.h"
@@ -898,6 +900,15 @@ MDSTableServer *MDSRank::get_table_server(int t)
   }
 }
 
+MDSMap::DaemonState MDSRank::get_want_state() const
+{
+  return beacon.get_want_state();
+}
+
+uint64_t MDSRank::get_global_id() const {
+  return monc->get_global_id();
+}
+
 void MDSRank::suicide()
 {
   if (suicide_hook) {
@@ -943,6 +954,11 @@ void MDSRank::damaged_unlocked()
   damaged();
 }
 
+double MDSRank::last_cleared_laggy() const
+{
+  return beacon.last_cleared_laggy();
+}
+
 void MDSRank::handle_write_error(int err)
 {
   if (err == -EBLOCKLISTED) {

diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index 5a46f765dc92b65fc60120322020dc2087d4e519..0149a270f9366e939f0b646387c440a2e56ec3d3 100644 (file)
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -19,19 +19,16 @@
 #include <string_view>
 
 #include "common/admin_socket.h" // for asok_finisher
-#include "common/DecayCounter.h"
 #include "common/LogClient.h"
 #include "common/TrackedOp.h" // for class OpTracker
 
 #include "include/common_fwd.h"
 
-#include "Beacon.h"
 #include "DamageTable.h"
 #include "MDSMap.h"
 #include "SessionMap.h"
 #include "PurgeQueue.h"
 #include "MetricsHandler.h"
-#include "mon/MonClient.h"
 
 // Full .h import instead of forward declaration for PerfCounter, for the
 // benefit of those including this header and using MDSRank::logger
@@ -39,6 +36,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 
+class DecayCounter;
 class MDSContext;
 class MDSMetaRequest;
 class MMDSMap;
@@ -134,6 +132,7 @@ namespace ceph {
 template <class Mutex>
 class CommonSafeTimer;
 
+class Beacon;
 class Locker;
 class MDCache;
 class MDLog;
@@ -209,7 +208,7 @@ class MDSRank {
     Session *get_session(const cref_t<Message> &m);
 
     MDSMap::DaemonState get_state() const { return state; } 
-    MDSMap::DaemonState get_want_state() const { return beacon.get_want_state(); } 
+    MDSMap::DaemonState get_want_state() const;
 
     bool is_creating() const { return state == MDSMap::STATE_CREATING; }
     bool is_starting() const { return state == MDSMap::STATE_STARTING; }
@@ -259,9 +258,7 @@ class MDSRank {
       progress_thread.signal();
     }
 
-    uint64_t get_global_id() const {
-      return monc->get_global_id();
-    }
+    uint64_t get_global_id() const;
 
     // Daemon lifetime functions: these guys break the abstraction
     // and call up into the parent MDSDaemon instance.  It's kind
@@ -308,9 +305,7 @@ class MDSRank {
      */
     void damaged_unlocked();
 
-    double last_cleared_laggy() const {
-      return beacon.last_cleared_laggy();
-    }
+    double last_cleared_laggy() const;
 
     double get_dispatch_queue_max_age(utime_t now) const;
 

diff --git a/src/mds/MDSRankQuiesce.cc b/src/mds/MDSRankQuiesce.cc
index ba854cfd0865e6764ee81ed620c397e1505e63f9..c72d31f89c98360147fb6f6149ed07168613267e 100644 (file)
--- a/src/mds/MDSRankQuiesce.cc
+++ b/src/mds/MDSRankQuiesce.cc
@@ -12,6 +12,7 @@
 
 #include "MDSRank.h"
 #include "MDCache.h"
+#include "mon/MonClient.h"
 
 #include "QuiesceDbManager.h"
 #include "QuiesceAgent.h"