Merge pull request ceph#61942 from 9401adarsh/wip-adashoka-51855

rgw: add parameter for clients to time out incase they hit wrong url

Reviewed-by: Yuval Lifshitz <[email protected]>

Author: ivancich

src/rgw/driver/rados/rgw_pubsub_push.cc

@@ -101,6 +101,8 @@ class RGWPubSubHTTPEndpoint : public RGWPubSubEndpoint {
     }
     bufferlist read_bl;
     RGWPostHTTPData request(cct, "POST", endpoint, &read_bl, verify_ssl);
+    //default to 3 seconds for wrong url hits - if wrong endpoint configured
+    request.set_req_connect_timeout(3);
     const auto post_data = json_format_pubsub_event(event);
     if (cloudevents) {
       // following: https://github.com/cloudevents/spec/blob/v1.0.1/http-protocol-binding.md

src/rgw/rgw_http_client.cc

@@ -635,6 +635,7 @@ int RGWHTTPClient::init_request(rgw_http_req_data *_req_data)
   }
   curl_easy_setopt(easy_handle, CURLOPT_PRIVATE, (void *)req_data);
   curl_easy_setopt(easy_handle, CURLOPT_TIMEOUT, req_timeout);
+  curl_easy_setopt(easy_handle, CURLOPT_CONNECTTIMEOUT, req_connect_timeout);
 
   return 0;
 }

src/rgw/rgw_http_client.h

@@ -64,6 +64,7 @@ class RGWHTTPClient : public RGWIOProvider,
   param_vec_t headers;
 
   long  req_timeout{0L};
+  long  req_connect_timeout{0L};
 
   void init();
 
@@ -151,6 +152,12 @@ class RGWHTTPClient : public RGWIOProvider,
     req_timeout = timeout;
   }
 
+  // set request for connect phase timeout in seconds. 
+  // ensures wrong url hits don't stay alive post this limit
+  void set_req_connect_timeout(long connect_timeout) {
+    req_connect_timeout = connect_timeout;
+  }
+
   int process(const DoutPrefixProvider* dpp, optional_yield y);
 
   int wait(const DoutPrefixProvider* dpp, optional_yield y);