Fixes: http://tracker.ceph.com/issues/36302
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(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
#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 <chrono>
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,
rgw_tools_cleanup();
rgw_shutdown_resolver();
+ rgw::curl::cleanup_curl();
rgw_perf_stop(g_ceph_context);