mon: build without "using namespace std"

* add "std::" prefix in headers
* add "using" declarations in .cc files.

so we don't rely on "using namespace std" in one or more included
headers.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mon/ConnectionTracker.h b/src/mon/ConnectionTracker.h
index 58e9889eb2b32a06cd1458b8ee8b3c036528e1bf..c62d3c200d7408630e3cb0da3ed2e7e85c004cad 100644 (file)
--- a/src/mon/ConnectionTracker.h
+++ b/src/mon/ConnectionTracker.h
@@ -136,7 +136,7 @@ class ConnectionTracker {
  private:
   epoch_t epoch;
   uint64_t version;
-  map<int,ConnectionReport> peer_reports;
+  std::map<int,ConnectionReport> peer_reports;
   ConnectionReport my_reports;
   double half_life;
   RankProvider *owner;
@@ -190,7 +190,7 @@ class ConnectionTracker {
   void notify_rank_removed(int rank_removed);
   friend std::ostream& operator<<(std::ostream& o, const ConnectionTracker& c);
   friend ConnectionReport *get_connection_reports(ConnectionTracker& ct);
-  friend map<int,ConnectionReport> *get_peer_reports(ConnectionTracker& ct);
+  friend std::map<int,ConnectionReport> *get_peer_reports(ConnectionTracker& ct);
   void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<ConnectionTracker*>& o);
 };

diff --git a/src/mon/ElectionLogic.h b/src/mon/ElectionLogic.h
index 65c727ca1340322694af378ed3f47e836ea06d5a..e2f2db82ac88fe54632e5977b26d65efa5e51e13 100644 (file)
--- a/src/mon/ElectionLogic.h
+++ b/src/mon/ElectionLogic.h
@@ -17,6 +17,7 @@
 #define CEPH_ELECTIONLOGIC_H
 
 #include <map>
+#include <set>
 #include "include/types.h"
 #include "ConnectionTracker.h"
 
@@ -95,7 +96,7 @@ public:
    * Like paxos_size(), This set can change between elections, but not
    * during them.
    */
-  virtual const set<int>& get_disallowed_leaders() const = 0;
+  virtual const std::set<int>& get_disallowed_leaders() const = 0;
   /**
    * Tell the ElectionOwner we have started a new election.
    *

diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index d14dbb5c4ce9f1d76ab53d1967dc48d159aab65a..a581daa7ff5cc882ab8b99b1f0630eaf05acecec 100644 (file)
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -42,10 +42,10 @@ class Elector : public ElectionOwner, RankProvider {
   ElectionLogic logic;
   // connectivity validation and scoring
   ConnectionTracker peer_tracker;
-  map<int, utime_t> peer_acked_ping; // rank -> last ping stamp they acked
-  map<int, utime_t> peer_sent_ping; // rank -> last ping stamp we sent
-  set<int> live_pinging; // ranks which we are currently pinging
-  set<int> dead_pinging; // ranks which didn't answer (degrading scores)
+  std::map<int, utime_t> peer_acked_ping; // rank -> last ping stamp they acked
+  std::map<int, utime_t> peer_sent_ping; // rank -> last ping stamp we sent
+  std::set<int> live_pinging; // ranks which we are currently pinging
+  std::set<int> dead_pinging; // ranks which didn't answer (degrading scores)
   double ping_timeout; // the timeout after which we consider a ping to be dead
   int PING_DIVISOR = 2;  // we time out pings
 
@@ -242,8 +242,8 @@ class Elector : public ElectionOwner, RankProvider {
   /* Retrieve monmap->size() */
   unsigned paxos_size() const;
   /* Right now we don't disallow anybody */
-  set<int> disallowed_leaders;
-  const set<int>& get_disallowed_leaders() const { return disallowed_leaders; }
+  std::set<int> disallowed_leaders;
+  const std::set<int>& get_disallowed_leaders() const { return disallowed_leaders; }
   /**
    * Reset the expire_event timer so we can limit the amount of time we 
    * will be electing. Clean up our peer_info.
@@ -383,7 +383,7 @@ class Elector : public ElectionOwner, RankProvider {
    * @returns false if the set is unchanged,
    *   true if the set changed
    */
-  bool set_disallowed_leaders(const set<int>& dl) {
+  bool set_disallowed_leaders(const std::set<int>& dl) {
     if (dl == disallowed_leaders) return false;
     disallowed_leaders = dl;
     return true;

diff --git a/src/mon/KVMonitor.cc b/src/mon/KVMonitor.cc
index 9092bd15d4d63e03f49fdc83d0558bb35d123688..157e9ebfef750b188b5abdd00c450c116f47cd04 100644 (file)
--- a/src/mon/KVMonitor.cc
+++ b/src/mon/KVMonitor.cc
@@ -10,6 +10,12 @@
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, this)
 
+using std::ostream;
+using std::ostringstream;
+using std::set;
+using std::string;
+using std::stringstream;
+
 static ostream& _prefix(std::ostream *_dout, const Monitor &mon,
                         const KVMonitor *hmon) {
   return *_dout << "mon." << mon.name << "@" << mon.rank

diff --git a/src/mon/KVMonitor.h b/src/mon/KVMonitor.h
index 3796e9b0b5a62667c8e61f5d6d559aede9a1740b..8171ad34fdaf886f5a2a2dae19afb1e35a1a211f 100644 (file)
--- a/src/mon/KVMonitor.h
+++ b/src/mon/KVMonitor.h
@@ -16,14 +16,14 @@ class KVMonitor : public PaxosService
   version_t version = 0;
   std::map<std::string,std::optional<ceph::buffer::list>> pending;
 
-  bool _have_prefix(const string &prefix);
+  bool _have_prefix(const std::string &prefix);
 
 public:
   KVMonitor(Monitor &m, Paxos &p, const std::string& service_name);
 
   void init() override;
 
-  void get_store_prefixes(set<string>& s) const override;
+  void get_store_prefixes(std::set<std::string>& s) const override;
 
   bool preprocess_command(MonOpRequestRef op);
   bool prepare_command(MonOpRequestRef op);

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index e8b41e585e1ee0af24b8e93129a7180a72184175..9103ddf7c5b5d307e936457a462419e31dfe425f 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -72,6 +72,7 @@ using std::hex;
 using std::list;
 using std::map;
 using std::make_pair;
+using std::multimap;
 using std::ostream;
 using std::ostringstream;
 using std::pair;

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index c70814996fdc4e04cf4349b690a3894e8487a2c6..c41246992d5c83c7402258ff91868ea2e077d44c 100644 (file)
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -130,7 +130,7 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
   void count_metadata(const std::string& field, ceph::Formatter *f);
 
 public:
-  void print_fs_summary(ostream& out) {
+  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);

diff --git a/src/mon/MonCap.h b/src/mon/MonCap.h
index ab4e35bc90ce7cb704d590246821953dc4105d64..570f788ad590e1b604d1bd80667baf5b58483607 100644 (file)
--- a/src/mon/MonCap.h
+++ b/src/mon/MonCap.h
@@ -183,8 +183,8 @@ struct MonCap {
   void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<MonCap*>& ls);
 
-  std::vector<string> allowed_fs_names() const {
-    std::vector<string> ret;
+  std::vector<std::string> allowed_fs_names() const {
+    std::vector<std::string> ret;
     for (auto& g : grants) {
       if (not g.fs_name.empty()) {
        ret.push_back(g.fs_name);
@@ -195,7 +195,7 @@ struct MonCap {
     return ret;
   }
 
-  bool fs_name_capable(const EntityName& ename, string_view fs_name,
+  bool fs_name_capable(const EntityName& ename, std::string_view fs_name,
                       __u8 mask) {
     for (auto& g : grants) {
       if (g.is_allow_all()) {

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index c6ee6b8eb92fd3ced29ac01e0081eb0d81c59fef..19aa047c2181fccf0eebfc4e31e0eae540ce587c 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -698,20 +698,20 @@ public:
     }
   };
 
-  void start_mon_command(const vector<string>& cmd, const bufferlist& inbl,
-                        bufferlist *outbl, string *outs,
+  void start_mon_command(const std::vector<std::string>& cmd, const bufferlist& inbl,
+                        bufferlist *outbl, std::string *outs,
                         Context *onfinish) {
     start_mon_command(cmd, inbl, ContextVerter(outs, outbl, onfinish));
   }
   void start_mon_command(int mon_rank,
-                        const vector<string>& cmd, const bufferlist& inbl,
-                        bufferlist *outbl, string *outs,
+                        const std::vector<std::string>& cmd, const bufferlist& inbl,
+                        bufferlist *outbl, std::string *outs,
                         Context *onfinish) {
     start_mon_command(mon_rank, cmd, inbl, ContextVerter(outs, outbl, onfinish));
   }
-  void start_mon_command(const string &mon_name,  ///< mon name, with mon. prefix
-                        const vector<string>& cmd, const bufferlist& inbl,
-                        bufferlist *outbl, string *outs,
+  void start_mon_command(const std::string &mon_name,  ///< mon name, with mon. prefix
+                        const std::vector<std::string>& cmd, const bufferlist& inbl,
+                        bufferlist *outbl, std::string *outs,
                         Context *onfinish) {
     start_mon_command(mon_name, cmd, inbl, ContextVerter(outs, outbl, onfinish));
   }

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 22e4e4709abd9c05627aaa63d5bd4116485443e0..d45c039beebe4104c8966bc4210a6c5358e48899 100644 (file)
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -4,6 +4,7 @@
 #include "MonMap.h"
 
 #include <algorithm>
+#include <sstream>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -29,6 +30,7 @@
 using std::list;
 using std::map;
 using std::ostream;
+using std::ostringstream;
 using std::set;
 using std::string;
 using std::vector;

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 02304edfdd265c1b4966da10091ae7a880631302..0516d188249585cb941574cc02546a5fd5eeec24 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -162,8 +162,8 @@ class MonMap {
   election_strategy strategy = CLASSIC;
   std::set<std::string> disallowed_leaders; // can't be leader under CONNECTIVITY/DISALLOW
   bool stretch_mode_enabled = false;
-  string tiebreaker_mon;
-  set<string> stretch_marked_down_mons; // can't be leader until fully recovered
+  std::string tiebreaker_mon;
+  std::set<std::string> stretch_marked_down_mons; // can't be leader until fully recovered
 
 public:
   void calc_legacy_ranks();

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 8e4f39ae51e97f430ab20aeb5eb246d52a4a9bc7..22bf6e9669c6917a97b579da442d236e81b29c00 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -251,16 +251,16 @@ private:
   bool stretch_mode_engaged{false};
   bool degraded_stretch_mode{false};
   bool recovering_stretch_mode{false};
-  string stretch_bucket_divider;
-  map<string, set<string>> dead_mon_buckets; // bucket->mon ranks, locations with no live mons
-  set<string> up_mon_buckets; // locations with a live mon
+  std::string stretch_bucket_divider;
+  std::map<std::string, std::set<std::string>> dead_mon_buckets; // bucket->mon ranks, locations with no live mons
+  std::set<std::string> up_mon_buckets; // locations with a live mon
   void do_stretch_mode_election_work();
 
   bool session_stretch_allowed(MonSession *s, MonOpRequestRef& op);
   void disconnect_disallowed_stretch_sessions();
   void set_elector_disallowed_leaders(bool allow_election);
 
-  map <string,string> crush_loc;
+  std::map<std::string,std::string> crush_loc;
   bool need_set_crush_loc{false};
 public:
   bool is_stretch_mode() { return stretch_mode_engaged; }
@@ -281,15 +281,15 @@ public:
    */
   void try_engage_stretch_mode();
   void maybe_go_degraded_stretch_mode();
-  void trigger_degraded_stretch_mode(const set<string>& dead_mons,
-                                    const set<int>& dead_buckets);
+  void trigger_degraded_stretch_mode(const std::set<std::string>& dead_mons,
+                                    const std::set<int>& dead_buckets);
   void set_degraded_stretch_mode();
   void go_recovery_stretch_mode();
   void set_recovery_stretch_mode();
   void trigger_healthy_stretch_mode();
   void set_healthy_stretch_mode();
   void enable_stretch_mode();
-  void set_mon_crush_location(const string& loc);
+  void set_mon_crush_location(const std::string& loc);
 
   
 private:
@@ -894,7 +894,7 @@ public:
         }
         cmdmap_t cmdmap;
         std::ostringstream ds;
-        string prefix;
+        std::string prefix;
         cmdmap_from_json(m->cmd, &cmdmap, ds);
         cmd_getval(cmdmap, "prefix", prefix);
         if (prefix != "config set" && prefix != "config-key set")
@@ -995,8 +995,8 @@ private:
   void count_metadata(const std::string& field, ceph::Formatter *f);
   void count_metadata(const std::string& field, std::map<std::string,int> *out);
   // get_all_versions() gathers version information from daemons for health check
-  void get_all_versions(std::map<string, std::list<std::string>> &versions);
-  void get_versions(std::map<string, std::list<std::string>> &versions);
+  void get_all_versions(std::map<std::string, std::list<std::string>> &versions);
+  void get_versions(std::map<std::string, std::list<std::string>> &versions);
 
   // features
   static CompatSet get_initial_supported_features();

diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index cf22ae9f8e3f6800b2ec80adc4f3cc31492600a2..dc75e9620b2b4d07353d31f2c01a50aac4f9df50 100644 (file)
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -89,17 +89,17 @@ private:
    * @param tiebreaker_mon: the name of the monitor to declare tiebreaker
    * @param dividing_bucket: the bucket type (eg 'dc') that divides the cluster
    */
-  void try_enable_stretch_mode(stringstream& ss, bool *okay,
+  void try_enable_stretch_mode(std::stringstream& ss, bool *okay,
                               int *errcode, bool commit,
-                              const string& tiebreaker_mon,
-                              const string& dividing_bucket);
+                              const std::string& tiebreaker_mon,
+                              const std::string& dividing_bucket);
 
 public:
   /**
    * Set us to degraded stretch mode. Put the dead_mons in
    * the MonMap.
    */
-  void trigger_degraded_stretch_mode(const set<string>& dead_mons);
+  void trigger_degraded_stretch_mode(const std::set<std::string>& dead_mons);
   /**
    * Set us to healthy stretch mode: clear out the
    * down list to allow any non-tiebreaker mon to be the leader again.

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 0ecdcbb31f10f1f9a4df211592ce62c6505b70d7..6ba44edd8c91da05037c5fc72453e63ec540a3d3 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -788,9 +788,10 @@ public:
    * This does not make any changes to the pools or state; it's just
    * a safety-check-and-collect function.
    */
-  void try_enable_stretch_mode_pools(stringstream& ss, bool *okay,
+  void try_enable_stretch_mode_pools(std::stringstream& ss, bool *okay,
                                     int *errcode,
-                                    set<pg_pool_t*>* pools, const string& new_crush_rule);
+                                    std::set<pg_pool_t*>* pools,
+                                    const std::string& new_crush_rule);
   /**
    * Check validity of inputs and OSD/CRUSH state to
    * engage stretch mode. Designed to be used with
@@ -807,26 +808,26 @@ public:
    *   from try_enable_stretch_mode_pools()).
    * @param new_crush_rule: The crush rule to set the pools to.
    */
-  void try_enable_stretch_mode(stringstream& ss, bool *okay,
+  void try_enable_stretch_mode(std::stringstream& ss, bool *okay,
                               int *errcode, bool commit,
-                              const string& dividing_bucket,
+                              const std::string& dividing_bucket,
                               uint32_t bucket_count,
-                              const set<pg_pool_t*>& pools,
-                              const string& new_crush_rule);
+                              const std::set<pg_pool_t*>& pools,
+                              const std::string& new_crush_rule);
   /**
    * Check the input dead_buckets mapping (buckets->dead monitors) to see
    * if the OSDs are also down. If so, fill in really_down_buckets and
    * really_down_mons and return true; else return false.
    */
-  bool check_for_dead_crush_zones(const map<string,set<string>>& dead_buckets,
-                                 set<int> *really_down_buckets,
-                                 set<string> *really_down_mons);
+  bool check_for_dead_crush_zones(const std::map<std::string,std::set<std::string>>& dead_buckets,
+                                 std::set<int> *really_down_buckets,
+                                 std::set<std::string> *really_down_mons);
   /**
    * Set degraded mode in the OSDMap, adding the given dead buckets to the dead set
    * and using the live_zones (should presently be size 1)
    */
-  void trigger_degraded_stretch_mode(const set<int>& dead_buckets,
-                                    const set<string>& live_zones);
+  void trigger_degraded_stretch_mode(const std::set<int>& dead_buckets,
+                                    const std::set<std::string>& live_zones);
   /**
    * This is just to maintain stretch_recovery_triggered; below
    */

diff --git a/src/mon/Session.h b/src/mon/Session.h
index 3009d023944731b1616f27942b0bad3783d4924e..e090e7424043b1f2033382d7300511090e3af50b 100644 (file)
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -109,11 +109,11 @@ struct MonSession : public RefCountedObject {
       get_peer_socket_addr());
   }
 
-  std::vector<string> get_allowed_fs_names() const {
+  std::vector<std::string> get_allowed_fs_names() const {
     return caps.allowed_fs_names();
   }
 
-  bool fs_name_capable(string_view fsname, __u8 mask) {
+  bool fs_name_capable(std::string_view fsname, __u8 mask) {
     return caps.fs_name_capable(entity_name, fsname, mask);
   }