update sources to 12.2.2

[ceph.git] / ceph / src / ceph_mon.cc

diff --git a/ceph/src/ceph_mon.cc b/ceph/src/ceph_mon.cc
index 3663bb04e4b3c3e71dc20bace01969fcb92eb7ee..41a6ee0eb10a4b246d6f2df8eed6d862165b99a7 100644 (file)
--- a/ceph/src/ceph_mon.cc
+++ b/ceph/src/ceph_mon.cc
@@ -247,7 +247,6 @@ int main(int argc, const char **argv)
                         flags, "mon_data");
   ceph_heap_profiler_init();
 
-  uuid_d fsid;
   std::string val;
   for (std::vector<const char*>::iterator i = args.begin(); i != args.end(); ) {
     if (ceph_argparse_double_dash(args, i)) {
@@ -331,10 +330,11 @@ int main(int argc, const char **argv)
     MonMap monmap;
 
     // load or generate monmap
-    if (g_conf->monmap.length()) {
-      int err = monmapbl.read_file(g_conf->monmap.c_str(), &error);
+    const auto monmap_fn = g_conf->get_val<string>("monmap");
+    if (monmap_fn.length()) {
+      int err = monmapbl.read_file(monmap_fn.c_str(), &error);
       if (err < 0) {
-       derr << argv[0] << ": error reading " << g_conf->monmap << ": " << error << dendl;
+       derr << argv[0] << ": error reading " << monmap_fn << ": " << error << dendl;
        exit(1);
       }
       try {
@@ -342,9 +342,8 @@ int main(int argc, const char **argv)
 
        // always mark seed/mkfs monmap as epoch 0
        monmap.set_epoch(0);
-      }
-      catch (const buffer::error& e) {
-       derr << argv[0] << ": error decoding monmap " << g_conf->monmap << ": " << e.what() << dendl;
+      } catch (const buffer::error& e) {
+       derr << argv[0] << ": error decoding monmap " << monmap_fn << ": " << e.what() << dendl;
        exit(1);
       }      
     } else {
@@ -393,9 +392,10 @@ int main(int argc, const char **argv)
       }
     }
 
-    if (!g_conf->fsid.is_zero()) {
-      monmap.fsid = g_conf->fsid;
-      dout(0) << argv[0] << ": set fsid to " << g_conf->fsid << dendl;
+    const auto fsid = g_conf->get_val<uuid_d>("fsid");
+    if (!fsid.is_zero()) {
+      monmap.fsid = fsid;
+      dout(0) << argv[0] << ": set fsid to " << fsid << dendl;
     }
     
     if (monmap.fsid.is_zero()) {