From 86c4caef37aee1dd087d0776d549eeb1777bd150 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Wed, 7 Sep 2022 13:30:53 -0400 Subject: [PATCH] rgw/main: fix init order of rgw_main's init_storage() Signed-off-by: Matt Benjamin --- src/rgw/rgw_lib.cc | 5 +++-- src/rgw/rgw_main.cc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_lib.cc b/src/rgw/rgw_lib.cc index 768c9b51ea4..311d99a0eae 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 c4cfb2ebdb3..b09902948d4 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(); -- 2.39.5