From 878082f4bc1388a8521bdd4377f998511b585027 Mon Sep 17 00:00:00 2001 From: liangmingyuan Date: Thu, 5 Jan 2023 20:13:18 +0800 Subject: [PATCH] rgw: remove guard_reshard in bucket_index_read_olh_log Signed-off-by: Mingyuan Liang --- src/rgw/rgw_rados.cc | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 4f2820c6cb6..5880c5ae557 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -7100,33 +7100,25 @@ int RGWRados::bucket_index_read_olh_log(const DoutPrefixProvider *dpp, cls_rgw_obj_key key(obj_instance.key.get_index_key_name(), string()); - ret = guard_reshard(dpp, &bs, obj_instance, bucket_info, - [&](BucketShard *bs) -> int { - auto& ref = bs->bucket_obj.get_ref(); - ObjectReadOperation op; - cls_rgw_guard_bucket_resharding(op, -ERR_BUSY_RESHARDING); - - rgw_cls_read_olh_log_ret log_ret; - int op_ret = 0; - cls_rgw_get_olh_log(op, key, ver_marker, olh_tag, log_ret, op_ret); - bufferlist outbl; - int r = rgw_rados_operate(dpp, ref.pool.ioctx(), ref.obj.oid, &op, &outbl, null_yield); - if (r < 0) { - return r; - } - if (op_ret < 0) { - return op_ret; - } + auto& shard_ref = bs.bucket_obj.get_ref(); + ObjectReadOperation op; - *log = std::move(log_ret.log); - *is_truncated = log_ret.is_truncated; - return r; - }); - if (ret < 0) { - ldpp_dout(dpp, 20) << "cls_rgw_get_olh_log() returned r=" << r << dendl; - return ret; + rgw_cls_read_olh_log_ret log_ret; + int op_ret = 0; + cls_rgw_get_olh_log(op, key, ver_marker, olh_tag, log_ret, op_ret); + bufferlist outbl; + r = rgw_rados_operate(dpp, shard_ref.pool.ioctx(), shard_ref.obj.oid, &op, &outbl, null_yield); + if (r < 0) { + return r; + } + if (op_ret < 0) { + ldpp_dout(dpp, 20) << "cls_rgw_get_olh_log() returned op_ret=" << op_ret << dendl; + return op_ret; } + *log = std::move(log_ret.log); + *is_truncated = log_ret.is_truncated; + return 0; } -- 2.39.5