From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 5 Mar 2018 15:30:15 +0000 (+0100)
Subject: rgw: call setup and release curl handles in setup_curl
X-Git-Tag: v12.2.5~67^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=334da180452c4a4484833514f97e52af40d46c4f;p=ceph.git

rgw: call setup and release curl handles in setup_curl

Since rgw admin can also use it which will fail otherwise.

Fixes: http://tracker.ceph.com/issues/23203

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 08c4c05f5d939976c9e1607b9338f0a9b287708d)
---

diff --git a/src/rgw/rgw_http_client_curl.cc b/src/rgw/rgw_http_client_curl.cc
index fdb4c48c3a95..174a95e02faa 100644
--- a/src/rgw/rgw_http_client_curl.cc
+++ b/src/rgw/rgw_http_client_curl.cc
@@ -110,9 +110,11 @@ void setup_curl(boost::optional<const fe_map_t&> m) {
   #endif
 
   std::call_once(curl_init_flag, curl_global_init, curl_global_flags);
+  rgw_setup_saved_curl_handles();
 }
 
 void cleanup_curl() {
+  rgw_release_all_curl_handles();
   curl_global_cleanup();
 }
 
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index daa9fb8a53fc..da0c2fa08f3b 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -306,7 +306,6 @@ int main(int argc, const char **argv)
 
   rgw_init_resolver();
   rgw::curl::setup_curl(fe_map);
-  rgw_setup_saved_curl_handles();
 
 #if defined(WITH_RADOSGW_FCGI_FRONTEND)
   FCGX_Init();
@@ -582,7 +581,6 @@ int main(int argc, const char **argv)
 
   rgw_tools_cleanup();
   rgw_shutdown_resolver();
-  rgw_release_all_curl_handles();
   rgw::curl::cleanup_curl();
 
   rgw_perf_stop(g_ceph_context);