From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 30 Jan 2015 22:34:32 +0000 (-0800)
Subject: rgw: finalize perfcounters after shutting down storage
X-Git-Tag: v0.92~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de2e5fa048639de6c9ee004a93ab295625fa3b94;p=ceph.git

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 <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 2f2b755a762e..33a3ed3722bd 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;