import ceph quincy 17.2.4

[ceph.git] / ceph / src / mds / MDLog.h

diff --git a/ceph/src/mds/MDLog.h b/ceph/src/mds/MDLog.h
index b6b0be60f9d57a31f1cd564577b8aac8f221bb19..6111f85a97f97bea5a221ca429954cd23f5a4e46 100644 (file)
--- a/ceph/src/mds/MDLog.h
+++ b/ceph/src/mds/MDLog.h
@@ -121,7 +121,7 @@ public:
   Journaler *get_journaler() { return journaler; }
   bool empty() const { return segments.empty(); }
 
-  bool is_capped() const { return capped; }
+  bool is_capped() const { return mds_is_shutting_down; }
   void cap();
 
   void kick_submitter();
@@ -258,7 +258,7 @@ protected:
 
   int num_events = 0; // in events
   int unflushed = 0;
-  bool capped = false;
+  bool mds_is_shutting_down = false;
 
   // Log position which is persistent *and* for which
   // submit_entry wait_for_safe callbacks have already
@@ -298,6 +298,8 @@ private:
   void _prepare_new_segment();
   void _journal_segment_subtree_map(MDSContext *onsync);
 
+  void try_to_commit_open_file_table(uint64_t last_seq);
+
   void try_expire(LogSegment *ls, int op_prio);
   void _maybe_expired(LogSegment *ls, int op_prio);
   void _expired(LogSegment *ls);