update sources to v12.1.2

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

diff --git a/ceph/src/mon/MDSMonitor.h b/ceph/src/mon/MDSMonitor.h
index 05946b51c3c81abae0379639b40f682301fd7365..f17f58f96f2c42f64361bbd06581b40173335ecf 100644 (file)
--- a/ceph/src/mon/MDSMonitor.h
+++ b/ceph/src/mon/MDSMonitor.h
@@ -129,7 +129,7 @@ class MDSMonitor : public PaxosService {
 
   bool maybe_promote_standby(std::shared_ptr<Filesystem> fs);
   bool maybe_expand_cluster(std::shared_ptr<Filesystem> fs);
-  void maybe_replace_gid(mds_gid_t gid, const beacon_info_t &beacon,
+  void maybe_replace_gid(mds_gid_t gid, const MDSMap::mds_info_t& info,
       bool *mds_propose, bool *osd_propose);
   void tick() override;     // check state, take actions
 
@@ -139,6 +139,9 @@ class MDSMonitor : public PaxosService {
   void remove_from_metadata(MonitorDBStore::TransactionRef t);
   int load_metadata(map<mds_gid_t, Metadata>& m);
   void count_metadata(const string& field, Formatter *f);
+public:
+  void count_metadata(const string& field, map<string,int> *out);
+protected:
 
   // MDS daemon GID to latest health state from that GID
   std::map<uint64_t, MDSHealth> pending_daemon_health;