From 74f4b2c18c65b8090ea1cd0c64710cd2ad259ab4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 3 Oct 2018 11:38:07 -0400 Subject: [PATCH] librgw: initialize curl and http client for multisite Fixes: http://tracker.ceph.com/issues/36302 Signed-off-by: Casey Bodley (cherry picked from commit 1d44ba04513e06978fa1e3115ebb86292d625df4) Conflicts - src/rgw/librgw.cc - remove rgw_http_client_init() and rgw_http_client_cleanup() calls because these methods came from https://github.com/ceph/ceph/pull/18932 which wasn't backported to luminous --- src/rgw/librgw.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc index 4d7e32aaf4bbd..3909047ac92e8 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 #include @@ -489,6 +491,7 @@ namespace rgw { rgw_tools_init(g_ceph_context); rgw_init_resolver(); + rgw::curl::setup_curl(boost::none); store = RGWStoreManager::get_storage(g_ceph_context, g_conf->rgw_enable_gc_threads, @@ -598,6 +601,7 @@ namespace rgw { rgw_tools_cleanup(); rgw_shutdown_resolver(); + rgw::curl::cleanup_curl(); rgw_perf_stop(g_ceph_context); -- 2.39.5