From de2e5fa048639de6c9ee004a93ab295625fa3b94 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 30 Jan 2015 14:34:32 -0800 Subject: [PATCH] rgw: finalize perfcounters after shutting down storage Fixes: #10572 Backport: giant, firefly First disable the storage subsystem, then disable perfcounters. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 2f2b755a762e2..33a3ed3722bd8 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -1198,8 +1198,6 @@ int main(int argc, const char **argv) delete olog; - rgw_perf_stop(g_ceph_context); - RGWStoreManager::close_storage(store); rgw_tools_cleanup(); @@ -1211,6 +1209,8 @@ int main(int argc, const char **argv) ceph::crypto::shutdown(); + rgw_perf_stop(g_ceph_context); + signal_fd_finalize(); return 0; -- 2.39.5