summaryrefslogtreecommitdiffstats
path: root/src/rgw/rgw_rest_client.cc
diff options
context:
space:
mode:
authorAdam C. Emerson <aemerson@redhat.com>2020-11-11 23:12:08 +0100
committerAdam C. Emerson <aemerson@redhat.com>2020-11-13 20:35:15 +0100
commit6674a0d4a9118470029cde32ef036c999094a1b1 (patch)
tree21c635b6da4bed3579f944b6df8066c346e83121 /src/rgw/rgw_rest_client.cc
parentrgw: No null_yield in rgw_role (diff)
downloadceph-6674a0d4a9118470029cde32ef036c999094a1b1.tar.xz
ceph-6674a0d4a9118470029cde32ef036c999094a1b1.zip
rgw: No null_yield in rgw_rest
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Diffstat (limited to 'src/rgw/rgw_rest_client.cc')
-rw-r--r--src/rgw/rgw_rest_client.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rgw/rgw_rest_client.cc b/src/rgw/rgw_rest_client.cc
index 55236a79b59..eb38b15eda4 100644
--- a/src/rgw/rgw_rest_client.cc
+++ b/src/rgw/rgw_rest_client.cc
@@ -116,7 +116,7 @@ static void get_gmt_date_str(string& date_str)
date_str = buffer;
}
-int RGWRESTSimpleRequest::execute(RGWAccessKey& key, const char *_method, const char *resource)
+int RGWRESTSimpleRequest::execute(RGWAccessKey& key, const char *_method, const char *resource, optional_yield y)
{
method = _method;
string new_url = url;
@@ -155,7 +155,7 @@ int RGWRESTSimpleRequest::execute(RGWAccessKey& key, const char *_method, const
ldout(cct, 15) << "generated auth header: " << auth_hdr << dendl;
headers.push_back(pair<string, string>("AUTHORIZATION", auth_hdr));
- int r = process(null_yield);
+ int r = process(y);
if (r < 0)
return r;
@@ -269,7 +269,7 @@ static int sign_request(CephContext *cct, RGWAccessKey& key, RGWEnv& env, req_in
return 0;
}
-int RGWRESTSimpleRequest::forward_request(RGWAccessKey& key, req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl)
+int RGWRESTSimpleRequest::forward_request(RGWAccessKey& key, req_info& info, size_t max_response, bufferlist *inbl, bufferlist *outbl, optional_yield y)
{
string date_str;
@@ -331,7 +331,7 @@ int RGWRESTSimpleRequest::forward_request(RGWAccessKey& key, req_info& info, siz
method = new_info.method;
url = new_url;
- int r = process(null_yield);
+ int r = process(y);
if (r < 0){
if (r == -EINVAL){
// curl_easy has errored, generally means the service is not available