From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 2 Feb 2015 23:25:22 +0000 (-0800)
Subject: rgw: move perf cleanup before context cleanup
X-Git-Tag: v0.93~123^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3590%2Fhead;p=ceph.git

rgw: move perf cleanup before context cleanup

Fixes: #10722
Fixes: #10572
Backport: giant, firefly

This fixes a regression introduced in commit
de2e5fa048639de6c9ee004a93ab295625fa3b94.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 33a3ed3722bd..2960735abe0f 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1204,13 +1204,13 @@ int main(int argc, const char **argv)
   rgw_shutdown_resolver();
   curl_global_cleanup();
 
+  rgw_perf_stop(g_ceph_context);
+
   dout(1) << "final shutdown" << dendl;
   g_ceph_context->put();
 
   ceph::crypto::shutdown();
 
-  rgw_perf_stop(g_ceph_context);
-
   signal_fd_finalize();
 
   return 0;