From 31bffea6948a0b00973b6791673af4cd3d132ec2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 1 Dec 2023 14:27:51 -0500 Subject: [PATCH] rgw/zone: remove check for (very) old pools config i'm not sure how this was meant to work originally, but now it's obviously broken - it tries to stat an object from the domain_root pool before the domain_root pool name gets filled in https://github.com/ceph/ceph/pull/50359 added a new error message that makes this clear: > ERROR: creating ioctx (pool=); r=-22 Signed-off-by: Casey Bodley --- src/rgw/rgw_zone.cc | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc index f41d987ec549..aeb58e2f48fe 100644 --- a/src/rgw/rgw_zone.cc +++ b/src/rgw/rgw_zone.cc @@ -33,7 +33,6 @@ std::string zonegroup_names_oid_prefix = "zonegroups_names."; std::string RGW_DEFAULT_ZONE_ROOT_POOL = "rgw.root"; std::string RGW_DEFAULT_ZONEGROUP_ROOT_POOL = "rgw.root"; std::string RGW_DEFAULT_PERIOD_ROOT_POOL = "rgw.root"; -std::string avail_pools = ".pools.avail"; std::string default_storage_pool_suffix = "rgw.buckets.data"; } @@ -412,22 +411,14 @@ int RGWZoneParams::set_as_default(const DoutPrefixProvider *dpp, optional_yield int RGWZoneParams::create(const DoutPrefixProvider *dpp, optional_yield y, bool exclusive) { - /* check for old pools config */ - rgw_raw_obj obj(domain_root, avail_pools); - auto sysobj = sysobj_svc->get_obj(obj); - int r = sysobj.rop().stat(y, dpp); - if (r < 0) { - ldpp_dout(dpp, 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 */ - RGWZonePlacementInfo default_placement; - default_placement.index_pool = name + "." + default_bucket_index_pool_suffix; - rgw_pool pool = name + "." + default_storage_pool_suffix; - default_placement.storage_classes.set_storage_class(RGW_STORAGE_CLASS_STANDARD, &pool, nullptr); - default_placement.data_extra_pool = name + "." + default_storage_extra_pool_suffix; - placement_pools["default-placement"] = default_placement; - } + RGWZonePlacementInfo default_placement; + default_placement.index_pool = name + "." + default_bucket_index_pool_suffix; + rgw_pool pool = name + "." + default_storage_pool_suffix; + default_placement.storage_classes.set_storage_class(RGW_STORAGE_CLASS_STANDARD, &pool, nullptr); + default_placement.data_extra_pool = name + "." + default_storage_extra_pool_suffix; + placement_pools["default-placement"] = default_placement; - r = fix_pool_names(dpp, y); + int r = fix_pool_names(dpp, y); if (r < 0) { ldpp_dout(dpp, 0) << "ERROR: fix_pool_names returned r=" << r << dendl; return r; -- 2.47.3