Import ceph 15.2.8

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

diff --git a/ceph/src/mon/MonMap.h b/ceph/src/mon/MonMap.h
index a149b44ca8b6394cd37bcc16a9eb1450ca1fd074..d28046c2d97c7249ea69e902cd0d6c7ecb03e923 100644 (file)
--- a/ceph/src/mon/MonMap.h
+++ b/ceph/src/mon/MonMap.h
@@ -30,7 +30,7 @@
 
 
 #ifdef WITH_SEASTAR
-namespace ceph::common {
+namespace crimson::common {
   class ConfigProxy;
 }
 #endif
@@ -456,6 +456,17 @@ public:
 
   static void generate_test_instances(std::list<MonMap*>& o);
 protected:
+  /**
+   * build a monmap from a list of entity_addrvec_t's
+   *
+   * Give mons dummy names.
+   *
+   * @param addrs  list of entity_addrvec_t's
+   * @param prefix prefix to prepend to generated mon names
+   */
+  void init_with_addrs(const std::vector<entity_addrvec_t>& addrs,
+                       bool for_mkfs,
+                       std::string_view prefix);
   /**
    * build a monmap from a list of ips
    *
@@ -467,7 +478,7 @@ protected:
    */
   int init_with_ips(const std::string& ips,
                    bool for_mkfs,
-                   const std::string &prefix);
+                   std::string_view prefix);
   /**
    * build a monmap from a list of hostnames
    *
@@ -479,7 +490,7 @@ protected:
    */
   int init_with_hosts(const std::string& hostlist,
                      bool for_mkfs,
-                     const std::string& prefix);
+                     std::string_view prefix);
   int init_with_config_file(const ConfigProxy& conf, std::ostream& errout);
 #if WITH_SEASTAR
   seastar::future<> read_monmap(const std::string& monmap);