From: Yuval Lifshitz Date: Tue, 1 Feb 2022 09:04:06 +0000 (+0200) Subject: rgw/reshard: resolve inconsistent cache warnings X-Git-Tag: v18.0.0~787^2~48 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9eab2dbc976c6feeaf2bfb3423ece7a4ab4965cd;p=ceph.git rgw/reshard: resolve inconsistent cache warnings use an API that does not check for cache inconsistency hence, "WARNING: The bucket info cache is inconsistent" warnings is removed from reshard Signed-off-by: Yuval Lifshitz --- diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index f91debd2cea8..b2caaf9972aa 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -6843,8 +6843,9 @@ int RGWRados::block_while_resharding(RGWRados::BucketShard *bs, // new_bucket_id and returns 0, otherwise it returns a negative // error code auto fetch_new_bucket_info = - [this, &bucket_info, &bucket_attrs, dpp](const std::string& log_tag) -> int { - int ret = try_refresh_bucket_info(bucket_info, nullptr, dpp, &bucket_attrs); + [this, bs, &bucket_info, &bucket_attrs, &y, dpp](const std::string& log_tag) -> int { + int ret = get_bucket_info(&svc, bs->bucket.tenant, bs->bucket.name, + bucket_info, nullptr, y, dpp, &bucket_attrs); if (ret < 0) { ldpp_dout(dpp, 0) << __func__ << " ERROR: failed to refresh bucket info after reshard at " <<