]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/reshard: resolve inconsistent cache warnings
authorYuval Lifshitz <ylifshit@redhat.com>
Tue, 1 Feb 2022 09:04:06 +0000 (11:04 +0200)
committerAdam C. Emerson <aemerson@redhat.com>
Wed, 2 Feb 2022 00:09:48 +0000 (19:09 -0500)
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 <ylifshit@redhat.com>
src/rgw/rgw_rados.cc

index f1fc710e1f3ade6d1ded9abd12703ba0a2dbf585..1824a872ff8c55729c2accce25b854a429967f28 100644 (file)
@@ -6860,8 +6860,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 " <<