From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 26 Aug 2021 17:17:14 +0000 (+0000)
Subject: monmap, crimson: add support for the mon_host_override configurable.
X-Git-Tag: v17.1.0~968^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=309424f745ea64701fd4c5bad710ab22679678de;p=ceph.git

monmap, crimson: add support for the mon_host_override configurable.

NOTE: crimson still misses the `CephContext::get_mon_addrs()` support.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index d45c039beebe4..06ce6af282381 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -823,6 +823,20 @@ seastar::future<> MonMap::build_monmap(const crimson::common::ConfigProxy& conf,
 
 seastar::future<> MonMap::build_initial(const crimson::common::ConfigProxy& conf, bool for_mkfs)
 {
+  // mon_host_override?
+  if (auto mon_host_override = conf.get_val<std::string>("mon_host_override");
+      !mon_host_override.empty()) {
+    if (auto ret = init_with_ips(mon_host_override, for_mkfs, "noname-"); ret == 0) {
+      return make_ready_future<>();
+    }
+    // TODO: resolve_addrs() is a blocking call
+    if (auto ret = init_with_hosts(mon_host_override, for_mkfs, "noname-"); ret == 0) {
+      return make_ready_future<>();
+    } else {
+      throw std::runtime_error(cpp_strerror(ret));
+    }
+  }
+
   // file?
   if (const auto monmap = conf.get_val<std::string>("monmap");
       !monmap.empty()) {