From: Ali Maredia <amaredia@redhat.com>
Date: Tue, 30 Apr 2019 21:28:18 +0000 (-0400)
Subject: rgw: add optional_yield to RGWRados::_get_bucket_info()
X-Git-Tag: v15.1.0~2602^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fda07d785e88c0257834a15c9a1605cf1e2c61b2;p=ceph.git

rgw: add optional_yield to RGWRados::_get_bucket_info()

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index d630d4dc18b..399db5bdadd 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -8242,7 +8242,8 @@ int RGWRados::_get_bucket_info(RGWSysObjectCtx& obj_ctx,
                                RGWBucketInfo& info,
                                real_time *pmtime,
                                map<string, bufferlist> *pattrs,
-                               boost::optional<obj_version> refresh_version)
+                               boost::optional<obj_version> refresh_version,
+                               optional_yield y)
 {
   string bucket_entry;
   rgw_make_bucket_entry_name(tenant, bucket_name, bucket_entry);
@@ -8345,7 +8346,7 @@ int RGWRados::get_bucket_info(RGWSysObjectCtx& obj_ctx,
                               optional_yield y, map<string, bufferlist> *pattrs)
 {
   return _get_bucket_info(obj_ctx, tenant, bucket_name, info, pmtime,
-                          pattrs, boost::none);
+                          pattrs, boost::none, y);
 }
 
 int RGWRados::try_refresh_bucket_info(RGWBucketInfo& info,
@@ -8355,7 +8356,7 @@ int RGWRados::try_refresh_bucket_info(RGWBucketInfo& info,
   RGWSysObjectCtx obj_ctx = svc.sysobj->init_obj_ctx();
 
   return _get_bucket_info(obj_ctx, info.bucket.tenant, info.bucket.name,
-                          info, pmtime, pattrs, info.objv_tracker.read_version);
+                          info, pmtime, pattrs, info.objv_tracker.read_version, null_yield);
 }
 
 int RGWRados::put_bucket_entrypoint_info(const string& tenant_name, const string& bucket_name, RGWBucketEntryPoint& entry_point,
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 010f196f919..72d821cc3e1 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -2151,7 +2151,8 @@ private:
 		       const string& bucket_name, RGWBucketInfo& info,
 		       real_time *pmtime,
 		       map<string, bufferlist> *pattrs,
-		       boost::optional<obj_version> refresh_version);
+		       boost::optional<obj_version> refresh_version,
+                       optional_yield y);
 public:
 
   bool call(std::string_view command, const cmdmap_t& cmdmap,