From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 9 Jul 2013 16:19:16 +0000 (-0700)
Subject: rgw: warn on the lack of curl_multi_wait()
X-Git-Tag: v0.67-rc1~128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F415%2Fhead;p=ceph.git

rgw: warn on the lack of curl_multi_wait()

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index c1a67016bc05..e3c853c19d7f 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -392,6 +392,18 @@ done:
   delete req;
 }
 
+#ifdef HAVE_CURL_MULTI_WAIT
+static void check_curl()
+{
+}
+#else
+static void check_curl()
+{
+  derr << "WARNING: libcurl doesn't support curl_multi_wait()" << dendl;
+  derr << "WARNING: cross zone / region transfer performance may be affected" << dendl;
+}
+#endif
+
 class C_InitTimeout : public Context {
 public:
   C_InitTimeout() {}
@@ -443,6 +455,8 @@ int main(int argc, const char **argv)
     }
   }
 
+  check_curl();
+
   if (g_conf->daemonize) {
     if (g_conf->rgw_socket_path.empty() and g_conf->rgw_port.empty()) {
       cerr << "radosgw: must specify 'rgw socket path' or 'rgw port' to run as a daemon" << std::endl;