From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 7 Sep 2022 17:30:53 +0000 (-0400)
Subject: rgw/main:  fix init order of rgw_main's init_storage()
X-Git-Tag: v18.0.0~56^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86c4caef37aee1dd087d0776d549eeb1777bd150;p=ceph.git

rgw/main:  fix init order of rgw_main's init_storage()

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_lib.cc b/src/rgw/rgw_lib.cc
index 768c9b51ea4d..311d99a0eae1 100644
--- a/src/rgw/rgw_lib.cc
+++ b/src/rgw/rgw_lib.cc
@@ -495,6 +495,9 @@ namespace rgw {
 
     common_init_finish(g_ceph_context);
 
+    main.init_perfcounters();
+    main.init_http_clients();
+
     main.init_storage();
     if (! main.get_store()) {
       mutex.lock();
@@ -506,8 +509,6 @@ namespace rgw {
       return -EIO;
     }
 
-    main.init_perfcounters();
-    main.init_http_clients();
     main.cond_init_apis();
 
     mutex.lock();
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index c4cfb2ebdb33..b09902948d41 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -132,6 +132,9 @@ int main(int argc, char *argv[])
   register_async_signal_handler(SIGUSR1, rgw::signal::handle_sigterm);
   sighandler_alrm = signal(SIGALRM, godown_alarm);
 
+  main.init_perfcounters();
+  main.init_http_clients();
+
   main.init_storage();
   if (! main.get_store()) {
     mutex.lock();
@@ -143,8 +146,6 @@ int main(int argc, char *argv[])
     return EIO;
   }
 
-  main.init_perfcounters();
-  main.init_http_clients();
   main.cond_init_apis();
 
   mutex.lock();