From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 19 Jul 2023 09:39:31 +0000 (+0000)
Subject: ceph_mon: use the same `store` instace
X-Git-Tag: v18.2.5~687^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f607819e0dba59f9fecc5e24b497285b508a8757;p=ceph.git

ceph_mon: use the same `store` instace

Fixes: https://tracker.ceph.com/issues/61820

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit e48ef1f6c52cf769374f891a2d699f508aeabf5e)
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index ebd110b4254b..96cdab43b9f8 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -367,6 +367,8 @@ int main(int argc, const char **argv)
     exit(1);
   }
 
+  MonitorDBStore *store = new MonitorDBStore(g_conf()->mon_data);
+
   // -- mkfs --
   if (mkfs) {
 
@@ -522,9 +524,8 @@ int main(int argc, const char **argv)
     }
 
     // go
-    MonitorDBStore store(g_conf()->mon_data);
     ostringstream oss;
-    int r = store.create_and_open(oss);
+    int r = store->create_and_open(oss);
     if (oss.tellp())
       derr << oss.str() << dendl;
     if (r < 0) {
@@ -534,13 +535,13 @@ int main(int argc, const char **argv)
     }
     ceph_assert(r == 0);
 
-    Monitor mon(g_ceph_context, g_conf()->name.get_id(), &store, 0, 0, &monmap);
+    Monitor mon(g_ceph_context, g_conf()->name.get_id(), store, 0, 0, &monmap);
     r = mon.mkfs(osdmapbl);
     if (r < 0) {
       derr << argv[0] << ": error creating monfs: " << cpp_strerror(r) << dendl;
       exit(1);
     }
-    store.close();
+    store->close();
     dout(0) << argv[0] << ": created monfs at " << g_conf()->mon_data 
 	    << " for " << g_conf()->name << dendl;
     return 0;
@@ -618,8 +619,6 @@ int main(int argc, const char **argv)
   // set up signal handlers, now that we've daemonized/forked.
   init_async_signal_handler();
 
-  MonitorDBStore *store = new MonitorDBStore(g_conf()->mon_data);
-
   // make sure we aren't upgrading too fast
   {
     string val;