update ceph source to reef 18.2.1

[ceph.git] / ceph / src / client / MetaSession.h

diff --git a/ceph/src/client/MetaSession.h b/ceph/src/client/MetaSession.h
index c28cd0b83b6e786725bc90d05121d57b3a443a41..301306263e66ee7093e8279f2563ed4cb588b601 100644 (file)
--- a/ceph/src/client/MetaSession.h
+++ b/ceph/src/client/MetaSession.h
@@ -25,6 +25,7 @@ struct MetaSession {
   uint64_t cap_renew_seq = 0;
   entity_addrvec_t addrs;
   feature_bitset_t mds_features;
+  feature_bitset_t mds_metric_flags;
 
   enum {
     STATE_NEW, // Unused
@@ -46,9 +47,11 @@ struct MetaSession {
   int mds_state = MDSMap::STATE_NULL;
   bool readonly = false;
 
-  list<Context*> waiting_for_open;
+  std::list<Context*> waiting_for_open;
 
   xlist<Cap*> caps;
+  // dirty_list keeps all the dirty inodes before flushing in current session.
+  xlist<Inode*> dirty_list;
   xlist<Inode*> flushing_caps;
   xlist<MetaRequest*> requests;
   xlist<MetaRequest*> unsafe_requests;
@@ -59,6 +62,15 @@ struct MetaSession {
   MetaSession(mds_rank_t mds_num, ConnectionRef con, const entity_addrvec_t& addrs)
     : mds_num(mds_num), con(con), addrs(addrs) {
   }
+  ~MetaSession() {
+    ceph_assert(caps.empty());
+    ceph_assert(dirty_list.empty());
+    ceph_assert(flushing_caps.empty());
+    ceph_assert(requests.empty());
+    ceph_assert(unsafe_requests.empty());
+  }
+
+  xlist<Inode*> &get_dirty_list() { return dirty_list; }
 
   const char *get_state_name() const;
 
@@ -68,4 +80,5 @@ struct MetaSession {
       ceph_seq_t mseq, epoch_t osd_barrier);
 };
 
+using MetaSessionRef = std::shared_ptr<MetaSession>;
 #endif