From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 3 Oct 2018 15:38:07 +0000 (-0400)
Subject: librgw: initialize curl and http client for multisite
X-Git-Tag: v13.2.3~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=191bc07364559eeedacd1f522dc122f36858b186;p=ceph.git

librgw: initialize curl and http client for multisite

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1d44ba04513e06978fa1e3115ebb86292d625df4)
---

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 65b275963bc9..68b1ce6f87bd 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -49,6 +49,8 @@
 #include "rgw_auth_s3.h"
 #include "rgw_lib.h"
 #include "rgw_lib_frontend.h"
+#include "rgw_http_client.h"
+#include "rgw_http_client_curl.h"
 
 #include <errno.h>
 #include <thread>
@@ -488,6 +490,8 @@ namespace rgw {
     rgw_tools_init(g_ceph_context);
 
     rgw_init_resolver();
+    rgw::curl::setup_curl(boost::none);
+    rgw_http_client_init(g_ceph_context);
 
     store = RGWStoreManager::get_storage(g_ceph_context,
 					 g_conf->rgw_enable_gc_threads,
@@ -597,6 +601,8 @@ namespace rgw {
 
     rgw_tools_cleanup();
     rgw_shutdown_resolver();
+    rgw_http_client_cleanup();
+    rgw::curl::cleanup_curl();
 
     rgw_perf_stop(g_ceph_context);