]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: move perf cleanup before context cleanup 3590/head
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 2 Feb 2015 23:25:22 +0000 (15:25 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 2 Feb 2015 23:37:37 +0000 (15:37 -0800)
Fixes: #10722
Fixes: #10572
Backport: giant, firefly

This fixes a regression introduced in commit
de2e5fa048639de6c9ee004a93ab295625fa3b94.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_main.cc

index 33a3ed3722bd8824de72c44c402e10a85f4b8c2f..2960735abe0fd5d86ad8bf09f26bb9f0a79ccb05 100644 (file)
@@ -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;