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 768c9b51ea4d580a93ac9a0c5534290b95930846..311d99a0eae13fb4f6c62b866fd5d133374fdc30 100644 (file)
--- 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 c4cfb2ebdb33ff750293d75919f8e6f8458631b0..b09902948d416ca6eac55ce959f65639d5fcb1b2 100644 (file)
--- 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();