import quincy beta 17.1.0

[ceph.git] / ceph / src / mon / MDSMonitor.h

diff --git a/ceph/src/mon/MDSMonitor.h b/ceph/src/mon/MDSMonitor.h
index 1475e312d069928483c66d69a85260c8ba0eb9e4..c41246992d5c83c7402258ff91868ea2e077d44c 100644 (file)
--- a/ceph/src/mon/MDSMonitor.h
+++ b/ceph/src/mon/MDSMonitor.h
@@ -32,14 +32,17 @@ class FileSystemCommandHandler;
 
 class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHandler {
  public:
-  MDSMonitor(Monitor *mn, Paxos *p, string service_name);
+  using clock = ceph::coarse_mono_clock;
+  using time = ceph::coarse_mono_time;
+
+  MDSMonitor(Monitor &mn, Paxos &p, std::string service_name);
 
   // service methods
   void create_initial() override;
-  void get_store_prefixes(std::set<string>& s) const override;
+  void get_store_prefixes(std::set<std::string>& s) const override;
   void update_from_paxos(bool *need_bootstrap) override;
   void init() override;
-  void create_pending() override; 
+  void create_pending() override;
   void encode_pending(MonitorDBStore::TransactionRef t) override;
   // we don't require full versions; don't encode any.
   void encode_full(MonitorDBStore::TransactionRef t) override { }
@@ -62,17 +65,19 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
   void check_subs();
   void check_sub(Subscription *sub);
 
-  void dump_info(Formatter *f);
-  int print_nodes(Formatter *f);
+  void dump_info(ceph::Formatter *f);
+  int print_nodes(ceph::Formatter *f);
 
   /**
-   * Return true if a blacklist was done (i.e. OSD propose needed)
+   * Return true if a blocklist was done (i.e. OSD propose needed)
    */
   bool fail_mds_gid(FSMap &fsmap, mds_gid_t gid);
 
-  bool is_leader() const override { return mon->is_leader(); }
+  bool is_leader() const override { return mon.is_leader(); }
 
  protected:
+  using mds_info_t = MDSMap::mds_info_t;
+
   // my helpers
   template<int dblV = 7>
   void print_map(const FSMap &m);
@@ -87,8 +92,7 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
   bool prepare_offload_targets(MonOpRequestRef op);
 
   int fail_mds(FSMap &fsmap, std::ostream &ss,
-      const std::string &arg,
-      MDSMap::mds_info_t *failed_info);
+      const std::string &arg, mds_info_t *failed_info);
 
   bool preprocess_command(MonOpRequestRef op);
   bool prepare_command(MonOpRequestRef op);
@@ -102,44 +106,53 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
 
   // beacons
   struct beacon_info_t {
-    mono_time stamp = mono_clock::zero();
+    ceph::mono_time stamp = ceph::mono_clock::zero();
     uint64_t seq = 0;
     beacon_info_t() {}
-    beacon_info_t(mono_time stamp, uint64_t seq) : stamp(stamp), seq(seq) {}
+    beacon_info_t(ceph::mono_time stamp, uint64_t seq) : stamp(stamp), seq(seq) {}
   };
-  map<mds_gid_t, beacon_info_t> last_beacon;
+  std::map<mds_gid_t, beacon_info_t> last_beacon;
 
   std::list<std::shared_ptr<FileSystemCommandHandler> > handlers;
 
   bool maybe_promote_standby(FSMap& fsmap, Filesystem& fs);
   bool maybe_resize_cluster(FSMap &fsmap, fs_cluster_id_t fscid);
-  void maybe_replace_gid(FSMap &fsmap, mds_gid_t gid,
-      const MDSMap::mds_info_t& info, bool *mds_propose, bool *osd_propose);
+  bool drop_mds(FSMap &fsmap, mds_gid_t gid, const mds_info_t* rep_info, bool* osd_propose);
+  bool check_health(FSMap &fsmap, bool* osd_propose);
   void tick() override;     // check state, take actions
 
-  int dump_metadata(const FSMap &fsmap, const std::string &who, Formatter *f,
-      ostream& err);
+  int dump_metadata(const FSMap &fsmap, const std::string &who, ceph::Formatter *f,
+                   std::ostream& err);
 
   void update_metadata(mds_gid_t gid, const Metadata& metadata);
   void remove_from_metadata(const FSMap &fsmap, MonitorDBStore::TransactionRef t);
-  int load_metadata(map<mds_gid_t, Metadata>& m);
-  void count_metadata(const std::string& field, Formatter *f);
+  int load_metadata(std::map<mds_gid_t, Metadata>& m);
+  void count_metadata(const std::string& field, ceph::Formatter *f);
+
 public:
-  void count_metadata(const std::string& field, map<string,int> *out);
-protected:
+  void print_fs_summary(std::ostream& out) {
+    get_fsmap().print_fs_summary(out);
+  }
+  void count_metadata(const std::string& field, std::map<std::string,int> *out);
+  void get_versions(std::map<std::string, std::list<std::string>> &versions);
 
+protected:
   // MDS daemon GID to latest health state from that GID
   std::map<uint64_t, MDSHealth> pending_daemon_health;
   std::set<uint64_t> pending_daemon_health_rm;
 
-  map<mds_gid_t, Metadata> pending_metadata;
+  std::map<mds_gid_t, Metadata> pending_metadata;
 
   mds_gid_t gid_from_arg(const FSMap &fsmap, const std::string &arg, std::ostream& err);
 
   // When did the mon last call into our tick() method?  Used for detecting
   // when the mon was not updating us for some period (e.g. during slow
   // election) to reset last_beacon timeouts
-  mono_time last_tick = mono_clock::zero();
+  ceph::mono_time last_tick = ceph::mono_clock::zero();
+
+private:
+  time last_fsmap_struct_flush = clock::zero();
+  bool check_fsmap_struct_version = true;
 };
 
 #endif