From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 1 Mar 2022 18:23:45 +0000 (-0500)
Subject: rgw: remove libcurl warning about curl_multi_wait()
X-Git-Tag: v18.0.0~1283^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a379fdc52e559b04fadbcb180be45d933e2f3f13;p=ceph.git

rgw: remove libcurl warning about curl_multi_wait()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_http_client_curl.cc b/src/rgw/rgw_http_client_curl.cc
index c11eacdd417a..2477cfcebf13 100644
--- a/src/rgw/rgw_http_client_curl.cc
+++ b/src/rgw/rgw_http_client_curl.cc
@@ -66,14 +66,6 @@ void init_ssl(){
 namespace rgw {
 namespace curl {
 
-static void check_curl()
-{
-#ifndef HAVE_CURL_MULTI_WAIT
-  derr << "WARNING: libcurl doesn't support curl_multi_wait()" << dendl;
-  derr << "WARNING: cross zone / region transfer performance may be affected" << dendl;
-#endif
-}
-
 #if defined(WITH_CURL_OPENSSL) && OPENSSL_API_COMPAT < 0x10100000L
 void init_ssl() {
   ::openssl::init_ssl();
@@ -100,8 +92,6 @@ bool fe_inits_ssl(boost::optional <const fe_map_t&> m, long& curl_global_flags){
 std::once_flag curl_init_flag;
 
 void setup_curl(boost::optional<const fe_map_t&> m) {
-  check_curl();
-
   long curl_global_flags = CURL_GLOBAL_ALL;
 
   #if defined(WITH_CURL_OPENSSL) && OPENSSL_API_COMPAT < 0x10100000L