From b6be434dca2db9a5b81f6b95f3ff239be73a2a76 Mon Sep 17 00:00:00 2001 From: liangmingyuan Date: Wed, 1 Feb 2023 11:10:15 +0800 Subject: [PATCH] rgw/reshard: alway return directly when a shard is not resharding Signed-off-by: Mingyuan Liang --- src/rgw/driver/rados/rgw_rados.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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__ << -- 2.47.3