From 41806015adfbc002f5dcf5776ac56f77b3bf4baf Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 23 Nov 2018 15:46:22 -0500 Subject: [PATCH] rgw: callers pass null_yield to RGWSI_SysObj Signed-off-by: Casey Bodley --- src/rgw/rgw_bucket.cc | 4 +-- src/rgw/rgw_cr_rados.cc | 6 ++--- src/rgw/rgw_metadata.cc | 6 ++--- src/rgw/rgw_multi.cc | 5 ++-- src/rgw/rgw_putobj_processor.cc | 2 +- src/rgw/rgw_tools.cc | 10 ++++---- src/rgw/rgw_torrent.cc | 2 +- src/rgw/rgw_user.cc | 10 ++++---- src/rgw/rgw_zone.cc | 44 ++++++++++++++++----------------- src/rgw/services/svc_zone.cc | 26 +++++++++---------- 10 files changed, 58 insertions(+), 57 deletions(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 679dde48363..1c786a32a6c 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -888,7 +888,7 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg) auto sysobj = obj_ctx.get_obj(obj); r = sysobj.wop() .set_objv_tracker(&objv_tracker) - .write_attr(RGW_ATTR_ACL, aclbl); + .write_attr(RGW_ATTR_ACL, aclbl, null_yield); if (r < 0) { return r; } @@ -903,7 +903,7 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg) auto inst_sysobj = obj_ctx.get_obj(obj_bucket_instance); r = inst_sysobj.wop() .set_objv_tracker(&objv_tracker) - .write_attr(RGW_ATTR_ACL, aclbl); + .write_attr(RGW_ATTR_ACL, aclbl, null_yield); if (r < 0) { return r; } diff --git a/src/rgw/rgw_cr_rados.cc b/src/rgw/rgw_cr_rados.cc index 7284c10dc4e..d2bead2b49a 100644 --- a/src/rgw/rgw_cr_rados.cc +++ b/src/rgw/rgw_cr_rados.cc @@ -104,7 +104,7 @@ int RGWAsyncGetSystemObj::_send_request() .set_objv_tracker(&objv_tracker) .set_attrs(pattrs) .set_raw_attrs(raw_attrs) - .read(&bl); + .read(&bl, null_yield); } RGWAsyncGetSystemObj::RGWAsyncGetSystemObj(RGWCoroutine *caller, RGWAioCompletionNotifier *cn, RGWSI_SysObj *_svc, @@ -141,7 +141,7 @@ int RGWAsyncPutSystemObj::_send_request() return sysobj.wop() .set_objv_tracker(&objv_tracker) .set_exclusive(exclusive) - .write_data(bl); + .write_data(bl, null_yield); } RGWAsyncPutSystemObj::RGWAsyncPutSystemObj(RGWCoroutine *caller, RGWAioCompletionNotifier *cn, @@ -164,7 +164,7 @@ int RGWAsyncPutSystemObjAttrs::_send_request() .set_objv_tracker(&objv_tracker) .set_exclusive(false) .set_attrs(attrs) - .write_attrs(); + .write_attrs(null_yield); } RGWAsyncPutSystemObjAttrs::RGWAsyncPutSystemObjAttrs(RGWCoroutine *caller, RGWAioCompletionNotifier *cn, diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc index 44ceb2ecea2..aafc43d6cfa 100644 --- a/src/rgw/rgw_metadata.cc +++ b/src/rgw/rgw_metadata.cc @@ -372,7 +372,7 @@ int read_history(RGWRados *store, RGWMetadataLogHistory *state, /* bad history object, remove it */ rgw_raw_obj obj(pool, oid); auto sysobj = obj_ctx.get_obj(obj); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(store->ctx(), 0) << "ERROR: meta history is empty, but cannot remove it (" << cpp_strerror(-ret) << ")" << dendl; return ret; @@ -1076,7 +1076,7 @@ int RGWMetadataManager::remove_from_heap(RGWMetadataHandler *handler, const stri rgw_raw_obj obj(heap_pool, oid); auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - int ret = sysobj.wop().remove(); + int ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(store->ctx(), 0) << "ERROR: sysobj.wop().remove() oid=" << oid << " returned ret=" << ret << dendl; return ret; @@ -1146,7 +1146,7 @@ int RGWMetadataManager::remove_entry(RGWMetadataHandler *handler, auto sysobj = obj_ctx.get_obj(obj); ret = sysobj.wop() .set_objv_tracker(objv_tracker) - .remove(); + .remove(null_yield); /* cascading ret into post_modify() */ ret = post_modify(handler, section, key, log_data, objv_tracker, ret); diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc index 15b85155ed9..5a490269c60 100644 --- a/src/rgw/rgw_multi.cc +++ b/src/rgw/rgw_multi.cc @@ -136,9 +136,10 @@ int list_multipart_parts(RGWRados *store, RGWBucketInfo& bucket_info, snprintf(buf, sizeof(buf), "%08d", marker); p.append(buf); - ret = sysobj.omap().get_vals(p, num_parts + 1, &parts_map, nullptr); + ret = sysobj.omap().get_vals(p, num_parts + 1, &parts_map, + nullptr, null_yield); } else { - ret = sysobj.omap().get_all(&parts_map); + ret = sysobj.omap().get_all(&parts_map, null_yield); } if (ret < 0) return ret; diff --git a/src/rgw/rgw_putobj_processor.cc b/src/rgw/rgw_putobj_processor.cc index 7b3a9754a49..3ebff9223c4 100644 --- a/src/rgw/rgw_putobj_processor.cc +++ b/src/rgw/rgw_putobj_processor.cc @@ -485,7 +485,7 @@ int MultipartObjectProcessor::complete(size_t accounted_size, r = sysobj.omap() .set_must_exist(true) - .set(p, bl); + .set(p, bl, null_yield); if (r < 0) { return r; } diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc index b39cfd446b1..084fb822f45 100644 --- a/src/rgw/rgw_tools.cc +++ b/src/rgw/rgw_tools.cc @@ -47,7 +47,7 @@ int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& o .set_exclusive(exclusive) .set_mtime(set_mtime) .set_attrs(*pattrs) - .write(data); + .write(data, null_yield); if (ret == -ENOENT) { ret = rgwstore->create_pool(pool); @@ -57,7 +57,7 @@ int rgw_put_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string& o .set_exclusive(exclusive) .set_mtime(set_mtime) .set_attrs(*pattrs) - .write(data); + .write(data, null_yield); } } @@ -84,13 +84,13 @@ int rgw_get_system_obj(RGWRados *rgwstore, RGWSysObjectCtx& obj_ctx, const rgw_p int ret = rop.set_attrs(pattrs) .set_last_mod(pmtime) .set_objv_tracker(objv_tracker) - .stat(); + .stat(null_yield); if (ret < 0) return ret; ret = rop.set_cache_info(cache_info) .set_refresh_version(refresh_version) - .read(&bl); + .read(&bl, null_yield); if (ret == -ECANCELED) { /* raced, restart */ if (!original_readv.empty()) { @@ -123,7 +123,7 @@ int rgw_delete_system_obj(RGWRados *rgwstore, const rgw_pool& pool, const string rgw_raw_obj obj(pool, oid); return sysobj.wop() .set_objv_tracker(objv_tracker) - .remove(); + .remove(null_yield); } thread_local bool is_asio_thread = false; diff --git a/src/rgw/rgw_torrent.cc b/src/rgw/rgw_torrent.cc index c8786ee9a7e..7bc9469864c 100644 --- a/src/rgw/rgw_torrent.cc +++ b/src/rgw/rgw_torrent.cc @@ -250,7 +250,7 @@ int seed::save_torrent_file() auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(raw_obj); - op_ret = sysobj.omap().set(key, bl); + op_ret = sysobj.omap().set(key, bl, null_yield); if (op_ret < 0) { ldout(s->cct, 0) << "ERROR: failed to omap_set() op_ret = " << op_ret << dendl; diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index e6d58f6c45f..6588d70d108 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -401,7 +401,7 @@ int rgw_get_user_attrs_by_uid(RGWRados *store, return src.rop() .set_attrs(&attrs) .set_objv_tracker(objv_tracker) - .stat(); + .stat(null_yield); } int rgw_remove_key_index(RGWRados *store, RGWAccessKey& access_key) @@ -409,7 +409,7 @@ int rgw_remove_key_index(RGWRados *store, RGWAccessKey& access_key) rgw_raw_obj obj(store->svc.zone->get_zone_params().user_keys_pool, access_key.id); auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - return sysobj.wop().remove(); + return sysobj.wop().remove(null_yield); } int rgw_remove_uid_index(RGWRados *store, rgw_user& uid) @@ -436,7 +436,7 @@ int rgw_remove_email_index(RGWRados *store, string& email) rgw_raw_obj obj(store->svc.zone->get_zone_params().user_email_pool, email); auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - return sysobj.wop().remove(); + return sysobj.wop().remove(null_yield); } int rgw_remove_swift_name_index(RGWRados *store, string& swift_name) @@ -444,7 +444,7 @@ int rgw_remove_swift_name_index(RGWRados *store, string& swift_name) rgw_raw_obj obj(store->svc.zone->get_zone_params().user_swift_pool, swift_name); auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - return sysobj.wop().remove(); + return sysobj.wop().remove(null_yield); } /** @@ -492,7 +492,7 @@ int rgw_delete_user(RGWRados *store, RGWUserInfo& info, RGWObjVersionTracker& ob ldout(store->ctx(), 10) << "removing user buckets index" << dendl; auto obj_ctx = store->svc.sysobj->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(uid_bucks); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0 && ret != -ENOENT) { ldout(store->ctx(), 0) << "ERROR: could not remove " << info.user_id << ":" << uid_bucks << ", should be fixed (err=" << ret << ")" << dendl; return ret; diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc index 7c9f414ca17..27a2ef5d620 100644 --- a/src/rgw/rgw_zone.cc +++ b/src/rgw/rgw_zone.cc @@ -392,7 +392,7 @@ int RGWSystemMetaObj::read_default(RGWDefaultSystemMetaObjInfo& default_info, co auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) return ret; @@ -443,7 +443,7 @@ int RGWSystemMetaObj::set_as_default(bool exclusive) auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); int ret = sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); if (ret < 0) return ret; @@ -460,7 +460,7 @@ int RGWSystemMetaObj::read_id(const string& obj_name, string& object_id) auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) { return ret; } @@ -492,7 +492,7 @@ int RGWSystemMetaObj::delete_obj(bool old_format) string oid = get_default_oid(old_format); rgw_raw_obj default_named_obj(pool, oid); auto sysobj = sysobj_svc->get_obj(obj_ctx, default_named_obj); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "Error delete default obj name " << name << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -502,7 +502,7 @@ int RGWSystemMetaObj::delete_obj(bool old_format) string oid = get_names_oid_prefix() + name; rgw_raw_obj object_name(pool, oid); auto sysobj = sysobj_svc->get_obj(obj_ctx, object_name); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "Error delete obj name " << name << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -518,7 +518,7 @@ int RGWSystemMetaObj::delete_obj(bool old_format) rgw_raw_obj object_id(pool, oid); auto sysobj = sysobj_svc->get_obj(obj_ctx, object_id); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "Error delete object id " << id << ": " << cpp_strerror(-ret) << dendl; } @@ -541,7 +541,7 @@ int RGWSystemMetaObj::store_name(bool exclusive) auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); return sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); } int RGWSystemMetaObj::rename(const string& new_name) @@ -573,7 +573,7 @@ int RGWSystemMetaObj::rename(const string& new_name) rgw_raw_obj old_name_obj(pool, oid); auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, old_name_obj); - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "Error delete old obj name " << old_name << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -592,7 +592,7 @@ int RGWSystemMetaObj::read_info(const string& obj_id, bool old_format) auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) { ldout(cct, 0) << "failed reading obj info from " << pool << ":" << oid << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -665,7 +665,7 @@ int RGWSystemMetaObj::store_info(bool exclusive) auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); return sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); } int RGWSystemMetaObj::write(bool exclusive) @@ -754,7 +754,7 @@ int RGWRealm::create_control(bool exclusive) auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); return sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); } int RGWRealm::delete_control() @@ -763,7 +763,7 @@ int RGWRealm::delete_control() auto obj = rgw_raw_obj{pool, get_control_oid()}; auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, obj); - return sysobj.wop().remove(); + return sysobj.wop().remove(null_yield); } rgw_pool RGWRealm::get_pool(CephContext *cct) const @@ -835,7 +835,7 @@ int RGWRealm::notify_zone(bufferlist& bl) rgw_pool pool{get_pool(cct)}; auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, get_control_oid()}); - int ret = sysobj.wn().notify(bl, 0, nullptr); + int ret = sysobj.wn().notify(bl, 0, nullptr, null_yield); if (ret < 0) { return ret; } @@ -880,7 +880,7 @@ int RGWPeriodConfig::read(RGWSI_SysObj *sysobj_svc, const std::string& realm_id) auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) { return ret; } @@ -905,7 +905,7 @@ int RGWPeriodConfig::write(RGWSI_SysObj *sysobj_svc, const std::string& realm_id auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); return sysobj.wop() .set_exclusive(false) - .write(bl); + .write(bl, null_yield); } int RGWPeriod::init(CephContext *_cct, RGWSI_SysObj *_sysobj_svc, const string& period_realm_id, @@ -1011,7 +1011,7 @@ int RGWPeriod::read_latest_epoch(RGWPeriodLatestEpochInfo& info, bufferlist bl; auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, oid}); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) { ldout(cct, 1) << "error read_lastest_epoch " << pool << ":" << oid << dendl; return ret; @@ -1073,7 +1073,7 @@ int RGWPeriod::set_latest_epoch(epoch_t epoch, bool exclusive, auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); return sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); } int RGWPeriod::update_latest_epoch(epoch_t epoch) @@ -1131,7 +1131,7 @@ int RGWPeriod::delete_obj() rgw_raw_obj oid{pool, p.get_period_oid()}; auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, oid); - int ret = sysobj.wop().remove(); + int ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "WARNING: failed to delete period object " << oid << ": " << cpp_strerror(-ret) << dendl; @@ -1142,7 +1142,7 @@ int RGWPeriod::delete_obj() rgw_raw_obj oid{pool, get_period_oid_prefix() + get_latest_epoch_oid()}; auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, oid); - int ret = sysobj.wop().remove(); + int ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "WARNING: failed to delete period object " << oid << ": " << cpp_strerror(-ret) << dendl; @@ -1158,7 +1158,7 @@ int RGWPeriod::read_info() auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj{pool, get_period_oid()}); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0) { ldout(cct, 0) << "failed reading obj info from " << pool << ":" << get_period_oid() << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -1218,7 +1218,7 @@ int RGWPeriod::store_info(bool exclusive) auto sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); return sysobj.wop() .set_exclusive(exclusive) - .write(bl); + .write(bl, null_yield); } rgw_pool RGWPeriod::get_pool(CephContext *cct) const @@ -1645,7 +1645,7 @@ int RGWZoneParams::create(bool exclusive) rgw_raw_obj obj(domain_root, avail_pools); auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = sysobj_svc->get_obj(obj_ctx, obj); - int r = sysobj.rop().stat(); + int r = sysobj.rop().stat(null_yield); if (r < 0) { ldout(cct, 10) << "couldn't find old data placement pools config, setting up new ones for the zone" << dendl; /* a new system, let's set new placement info */ diff --git a/src/rgw/services/svc_zone.cc b/src/rgw/services/svc_zone.cc index 724f83ae265..d3c3b371040 100644 --- a/src/rgw/services/svc_zone.cc +++ b/src/rgw/services/svc_zone.cc @@ -310,7 +310,7 @@ int RGWSI_Zone::replace_region_with_zonegroup() RGWSysObjectCtx obj_ctx = sysobj_svc->init_obj_ctx(); RGWSysObj sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0 && ret != -ENOENT) { ldout(cct, 0) << __func__ << " failed to read converted: ret "<< ret << " " << cpp_strerror(-ret) << dendl; @@ -533,7 +533,7 @@ int RGWSI_Zone::replace_region_with_zonegroup() /* mark as converted */ ret = sysobj.wop() .set_exclusive(true) - .write(bl); + .write(bl, null_yield); if (ret < 0 ) { ldout(cct, 0) << __func__ << " failed to mark cluster as converted: ret "<< ret << " " << cpp_strerror(-ret) << dendl; @@ -727,7 +727,7 @@ int RGWSI_Zone::convert_regionmap() RGWSysObjectCtx obj_ctx = sysobj_svc->init_obj_ctx(); RGWSysObj sysobj = sysobj_svc->get_obj(obj_ctx, rgw_raw_obj(pool, oid)); - int ret = sysobj.rop().read(&bl); + int ret = sysobj.rop().read(&bl, null_yield); if (ret < 0 && ret != -ENOENT) { return ret; } else if (ret == -ENOENT) { @@ -765,7 +765,7 @@ int RGWSI_Zone::convert_regionmap() current_period->set_bucket_quota(zonegroupmap.bucket_quota); // remove the region_map so we don't try to convert again - ret = sysobj.wop().remove(); + ret = sysobj.wop().remove(null_yield); if (ret < 0) { ldout(cct, 0) << "Error could not remove " << sysobj.get_obj() << " after upgrading to zonegroup map: " << cpp_strerror(ret) << dendl; @@ -1086,7 +1086,7 @@ int RGWSI_Zone::select_legacy_bucket_placement(RGWZonePlacementInfo *rule_info) auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - int ret = sysobj.rop().read(&map_bl); + int ret = sysobj.rop().read(&map_bl, null_yield); if (ret < 0) { goto read_omap; } @@ -1100,7 +1100,7 @@ int RGWSI_Zone::select_legacy_bucket_placement(RGWZonePlacementInfo *rule_info) read_omap: if (m.empty()) { - ret = sysobj.omap().get_all(&m); + ret = sysobj.omap().get_all(&m, null_yield); write_map = true; } @@ -1114,7 +1114,7 @@ read_omap: ret = rados_svc->pool().create(pools, &retcodes); if (ret < 0) return ret; - ret = sysobj.omap().set(s, bl); + ret = sysobj.omap().set(s, bl, null_yield); if (ret < 0) return ret; m[s] = bl; @@ -1123,7 +1123,7 @@ read_omap: if (write_map) { bufferlist new_bl; encode(m, new_bl); - ret = sysobj.wop().write(new_bl); + ret = sysobj.wop().write(new_bl, null_yield); if (ret < 0) { ldout(cct, 0) << "WARNING: could not save avail pools map info ret=" << ret << dendl; } @@ -1156,13 +1156,13 @@ int RGWSI_Zone::update_placement_map() auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - int ret = sysobj.omap().get_all(&m); + int ret = sysobj.omap().get_all(&m, null_yield); if (ret < 0) return ret; bufferlist new_bl; encode(m, new_bl); - ret = sysobj.wop().write(new_bl); + ret = sysobj.wop().write(new_bl, null_yield); if (ret < 0) { ldout(cct, 0) << "WARNING: could not save avail pools map info ret=" << ret << dendl; } @@ -1182,7 +1182,7 @@ int RGWSI_Zone::add_bucket_placement(const rgw_pool& new_pool) auto sysobj = obj_ctx.get_obj(obj); bufferlist empty_bl; - ret = sysobj.omap().set(new_pool.to_str(), empty_bl); + ret = sysobj.omap().set(new_pool.to_str(), empty_bl, null_yield); // don't care about return value update_placement_map(); @@ -1196,7 +1196,7 @@ int RGWSI_Zone::remove_bucket_placement(const rgw_pool& old_pool) auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - int ret = sysobj.omap().del(old_pool.to_str()); + int ret = sysobj.omap().del(old_pool.to_str(), null_yield); // don't care about return value update_placement_map(); @@ -1212,7 +1212,7 @@ int RGWSI_Zone::list_placement_set(set& names) rgw_raw_obj obj(zone_params->domain_root, avail_pools); auto obj_ctx = sysobj_svc->init_obj_ctx(); auto sysobj = obj_ctx.get_obj(obj); - int ret = sysobj.omap().get_all(&m); + int ret = sysobj.omap().get_all(&m, null_yield); if (ret < 0) return ret; -- 2.39.5