]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: add optional_yield to RGWRados::_get_bucket_info()
authorAli Maredia <amaredia@redhat.com>
Tue, 30 Apr 2019 21:28:18 +0000 (17:28 -0400)
committerAli Maredia <amaredia@redhat.com>
Fri, 17 May 2019 20:11:29 +0000 (16:11 -0400)
Signed-off-by: Ali Maredia <amaredia@redhat.com>
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h

index d630d4dc18b8e5a87f18a4ef0168633fef614869..399db5bdadd7d6cff04352e33a5b94b8c5439257 100644 (file)
@@ -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,
index 010f196f919062726c304f4c79df62c26a6ea7b4..72d821cc3e1c69cdf9ce5bde11b51fd5c296b13e 100644 (file)
@@ -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,