Merge pull request ceph#62870 from MaxKellermann/mds_includes

mds: include cleanup

Reviewed-by: Patrick Donnelly <[email protected]>

Author: MaxKellermann

src/ceph_mds.cc

@@ -26,6 +26,7 @@
 #include "include/random.h"
 
 #include "common/config.h"
+#include "common/debug.h"
 #include "common/strtol.h"
 #include "common/numa.h"
 

src/mds/Beacon.cc

@@ -12,8 +12,11 @@
  * 
  */
 
+#include "Beacon.h"
+#include "BatchOp.h"
+#include "Server.h"
 
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/likely.h"
 #include "common/HeartbeatMap.h"
 
@@ -22,13 +25,12 @@
 #include "include/util.h"
 
 #include "mon/MonClient.h"
+#include "mds/MDCache.h"
 #include "mds/MDLog.h"
 #include "mds/MDSRank.h"
-#include "mds/MDSMap.h"
 #include "mds/Locker.h"
 #include "mds/mdstypes.h"
-
-#include "Beacon.h"
+#include "osdc/Objecter.h"
 
 #include <chrono>
 

src/mds/Beacon.h

@@ -12,23 +12,25 @@
  * 
  */
 
-
 #ifndef BEACON_STATE_H
 #define BEACON_STATE_H
 
+#include <map>
 #include <mutex>
+#include <string>
 #include <string_view>
 #include <thread>
 
-#include "include/types.h"
-#include "include/Context.h"
+#include "include/common_fwd.h" // for CephContext
+#include "mds/MDSMap.h" // for MDSMap::DaemonState
 #include "msg/Dispatcher.h"
+#include "messages/MMDSBeacon.h" // for struct MDSHealth
 
-#include "messages/MMDSBeacon.h"
-
+class Connection;
+class Message;
 class MonClient;
 class MDSRank;
-
+class MMDSBeacon;
 
 /**
  * One of these per MDS.  Handle beacon logic in this separate class so

src/mds/CDentry.cc

@@ -18,21 +18,59 @@
 #include "CInode.h"
 #include "CDir.h"
 #include "SnapClient.h"
-
+#include "SnapRealm.h"
+#include "BatchOp.h"
 #include "MDSRank.h"
 #include "MDCache.h"
 #include "Locker.h"
 #include "LogSegment.h"
 
 #include "messages/MLock.h"
 
+#include "common/debug.h"
+#include "common/strescape.h" // for binstrprint()
+#include "include/filepath.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << dir->mdcache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") "
 
 using namespace std;
 
+CDentry::CDentry(std::string_view n, __u32 h,
+		 mempool::mds_co::string alternate_name,
+		 snapid_t f, snapid_t l) :
+  hash(h),
+  first(f), last(l),
+  item_dirty(this),
+  lock(this, &lock_type),
+  versionlock(this, &versionlock_type),
+  name(n),
+  alternate_name(std::move(alternate_name))
+{}
+
+CDentry::CDentry(std::string_view n, __u32 h,
+		 mempool::mds_co::string alternate_name,
+		 inodeno_t ino, inodeno_t referent_ino,
+		 unsigned char dt, snapid_t f, snapid_t l) :
+  hash(h),
+  first(f), last(l),
+  item_dirty(this),
+  lock(this, &lock_type),
+  versionlock(this, &versionlock_type),
+  name(n),
+  alternate_name(std::move(alternate_name))
+{
+  linkage.remote_ino = ino;
+  linkage.remote_d_type = dt;
+  linkage.referent_ino = referent_ino;
+}
+
+CDentry::~CDentry() {
+  ceph_assert(batch_ops.empty());
+}
+
 ostream& CDentry::print_db_line_prefix(ostream& out) const
 {
   return out << ceph_clock_now() << " mds." << dir->mdcache->mds->get_nodeid() << ".cache.den(" << dir->ino() << " " << name << ") ";

src/mds/CDentry.h

@@ -23,21 +23,21 @@
 #include "include/buffer_fwd.h"
 #include "include/lru.h"
 #include "include/elist.h"
-#include "include/filepath.h"
 #include <boost/intrusive/set.hpp>
 
-#include "BatchOp.h"
 #include "MDSCacheObject.h"
-#include "MDSContext.h"
 #include "SimpleLock.h"
 #include "LocalLockC.h"
-#include "ScrubHeader.h"
 
+class filepath;
+class BatchOp;
 class CInode;
 class CDir;
 class Locker;
 class CDentry;
 class LogSegment;
+class MDSContext;
+
 class Session;
 
 struct ClientLease : public boost::intrusive::set_base_hook<>
@@ -132,35 +132,13 @@ class CDentry : public MDSCacheObject, public LRUObject, public Counter<CDentry>
 
   CDentry(std::string_view n, __u32 h,
           mempool::mds_co::string alternate_name,
-	  snapid_t f, snapid_t l) :
-    hash(h),
-    first(f), last(l),
-    item_dirty(this),
-    lock(this, &lock_type),
-    versionlock(this, &versionlock_type),
-    name(n),
-    alternate_name(std::move(alternate_name))
-  {}
+	  snapid_t f, snapid_t l);
   CDentry(std::string_view n, __u32 h,
           mempool::mds_co::string alternate_name,
           inodeno_t ino, inodeno_t referent_ino,
-	  unsigned char dt, snapid_t f, snapid_t l) :
-    hash(h),
-    first(f), last(l),
-    item_dirty(this),
-    lock(this, &lock_type),
-    versionlock(this, &versionlock_type),
-    name(n),
-    alternate_name(std::move(alternate_name))
-  {
-    linkage.remote_ino = ino;
-    linkage.remote_d_type = dt;
-    linkage.referent_ino = referent_ino;
-  }
+	  unsigned char dt, snapid_t f, snapid_t l);
 
-  ~CDentry() override {
-    ceph_assert(batch_ops.empty());
-  }
+  ~CDentry() override;
 
   std::string_view pin_name(int p) const override {
     switch (p) {

src/mds/CDir.cc

@@ -30,8 +30,11 @@
 #include "LogSegment.h"
 #include "MDBalancer.h"
 #include "SnapClient.h"
+#include "SnapRealm.h"
+#include "events/EMetaBlob.h"
 
 #include "common/bloom_filter.hpp"
+#include "common/debug.h"
 #include "common/likely.h"
 #include "include/Context.h"
 #include "common/Clock.h"
@@ -42,6 +45,8 @@
 #include "include/ceph_assert.h"
 #include "include/compat.h"
 
+#include "messages/MClientReply.h" // for struct DirStat
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds
 #undef dout_prefix
@@ -219,6 +224,8 @@ CDir::CDir(CInode *in, frag_t fg, MDCache *mdc, bool auth) :
     state_set(STATE_AUTH);
 }
 
+CDir::~CDir() noexcept = default;
+
 /**
  * Check the recursive statistics on size for consistency.
  * If mds_debug_scatterstat is enabled, assert for correctness,
@@ -861,6 +868,10 @@ bool CDir::is_in_bloom(std::string_view name)
   return bloom->contains(name.data(), name.size());
 }
 
+void CDir::remove_bloom() {
+  bloom.reset();
+}
+
 void CDir::remove_null_dentries() {
   dout(12) << __func__ << " " << *this << dendl;
 

src/mds/CDir.h

@@ -22,22 +22,24 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <vector>
 
-#include "common/bloom_filter.hpp"
 #include "common/config.h"
 #include "include/buffer_fwd.h"
 #include "include/counter.h"
 #include "include/types.h"
 
+#include "snap.h" // for struct sr_t
 #include "CInode.h"
 #include "MDSCacheObject.h"
-#include "MDSContext.h"
-#include "cephfs_features.h"
-#include "SessionMap.h"
-#include "messages/MClientReply.h"
+#include "Mutation.h" // for struct MDLockCache
 
+struct DirStat;
+struct session_info_t;
+class bloom_filter;
 class CDentry;
 class MDCache;
+class MDSContext;
 
 std::ostream& operator<<(std::ostream& out, const class CDir& dir);
 
@@ -204,6 +206,7 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
   static const int DUMP_DEFAULT          = DUMP_ALL & (~DUMP_ITEMS);
 
   CDir(CInode *in, frag_t fg, MDCache *mdc, bool auth);
+  ~CDir() noexcept;
 
   std::string_view pin_name(int p) const override {
     switch (p) {
@@ -396,15 +399,13 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
   void add_to_bloom(CDentry *dn);
   bool is_in_bloom(std::string_view name);
   bool has_bloom() { return (bloom ? true : false); }
-  void remove_bloom() {
-    bloom.reset();
-  }
+  void remove_bloom();
 
   void try_remove_dentries_for_stray();
   bool try_trim_snap_dentry(CDentry *dn, const std::set<snapid_t>& snaps);
 
-  void split(int bits, std::vector<CDir*>* subs, MDSContext::vec& waiters, bool replay);
-  void merge(const std::vector<CDir*>& subs, MDSContext::vec& waiters, bool replay);
+  void split(int bits, std::vector<CDir*>* subs, std::vector<MDSContext*>& waiters, bool replay);
+  void merge(const std::vector<CDir*>& subs, std::vector<MDSContext*>& waiters, bool replay);
 
   bool should_split() const;
   bool should_split_fast() const;
@@ -508,10 +509,10 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
     return waiting_on_dentry.count(string_snap_t(dname, snap));
   }
   void add_dentry_waiter(std::string_view dentry, snapid_t snap, MDSContext *c);
-  void take_dentry_waiting(std::string_view dentry, snapid_t first, snapid_t last, MDSContext::vec& ls);
+  void take_dentry_waiting(std::string_view dentry, snapid_t first, snapid_t last, std::vector<MDSContext*>& ls);
 
   void add_waiter(uint64_t mask, MDSContext *c) override;
-  void take_waiting(uint64_t mask, MDSContext::vec& ls) override;  // may include dentry waiters
+  void take_waiting(uint64_t mask, std::vector<MDSContext*>& ls) override;  // may include dentry waiters
   void finish_waiting(uint64_t mask, int result = 0);    // ditto
 
   // -- import/export --
@@ -755,10 +756,10 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
   /* If you set up the bloom filter, you must keep it accurate!
    * It's deleted when you mark_complete() and is deliberately not serialized.*/
 
-  mempool::mds_co::compact_map<version_t, MDSContext::vec_alloc<mempool::mds_co::pool_allocator> > waiting_for_commit;
+  mempool::mds_co::compact_map<version_t, std::vector<MDSContext*, mempool::mds_co::pool_allocator<MDSContext*>>> waiting_for_commit;
 
   // -- waiters --
-  mempool::mds_co::map< string_snap_t, MDSContext::vec_alloc<mempool::mds_co::pool_allocator> > waiting_on_dentry; // FIXME string_snap_t not in mempool
+  mempool::mds_co::map< string_snap_t, std::vector<MDSContext*, mempool::mds_co::pool_allocator<MDSContext*>>> waiting_on_dentry; // FIXME string_snap_t not in mempool
 
 private:
   friend std::ostream& operator<<(std::ostream& out, const class CDir& dir);
@@ -779,9 +780,9 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
   void remove_null_dentries();
 
   void prepare_new_fragment(bool replay);
-  void prepare_old_fragment(std::map<string_snap_t, MDSContext::vec >& dentry_waiters, bool replay);
+  void prepare_old_fragment(std::map<string_snap_t, std::vector<MDSContext*> >& dentry_waiters, bool replay);
   void steal_dentry(CDentry *dn);  // from another dir.  used by merge/split.
-  void finish_old_fragment(MDSContext::vec& waiters, bool replay);
+  void finish_old_fragment(std::vector<MDSContext*>& waiters, bool replay);
   void init_fragment_pins();
   std::string get_path() const;