From: liangmingyuan Date: Wed, 1 Feb 2023 03:10:15 +0000 (+0800) Subject: rgw/reshard: alway return directly when a shard is not resharding X-Git-Tag: v19.0.0~1551^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6be434dca2db9a5b81f6b95f3ff239be73a2a76;p=ceph.git rgw/reshard: alway return directly when a shard is not resharding Signed-off-by: Mingyuan Liang --- diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index 0e3eaef9cb3c..82a54004ecda 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -6916,11 +6916,11 @@ int RGWRados::block_while_resharding(RGWRados::BucketShard *bs, if (!entry.resharding_in_progress()) { ret = fetch_new_bucket_info("get_bucket_resharding_succeeded"); if (ret < 0) { - ldpp_dout(dpp, 0) << "ERROR: " << __func__ << - " failed to refresh bucket info after reshard when get bucket " - "resharding succeeded, error: " << cpp_strerror(-ret) << dendl; - return ret; + ldpp_dout(dpp, 0) << "ERROR: " << __func__ << + " failed to refresh bucket info after reshard when get bucket " + "resharding succeeded, error: " << cpp_strerror(-ret) << dendl; } + return ret; } ldpp_dout(dpp, 20) << __func__ << " NOTICE: reshard still in progress; " << @@ -6957,7 +6957,7 @@ int RGWRados::block_while_resharding(RGWRados::BucketShard *bs, ldpp_dout(dpp, 0) << __func__ << " ERROR: failed to refresh bucket_obj for bucket " << bs->bucket.name << dendl; - continue; // try again + return ret; } } else { ldpp_dout(dpp, 10) << __func__ <<