From d64e273de1623fe784a3b8c9d2c21990f78b7be2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 23 Aug 2024 14:49:32 -0400 Subject: [PATCH] rgw: realm create only sets default realm on --default Signed-off-by: Casey Bodley --- PendingReleaseNotes | 2 ++ src/rgw/driver/rados/rgw_zone.cc | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index e2b678bafdd3e..eae40486767ed 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -103,6 +103,8 @@ config option. Previously, they would ignore invalid or missing realms and go on to load a zone/zonegroup in a different realm. If startup fails with a "failed to load realm" error, fix or remove the ``rgw_realm`` option. +* rgw: The radosgw-admin commands ``realm create`` and ``realm pull`` no + longer set the default realm without ``--default``. * CephFS: Running the command "ceph fs authorize" for an existing entity now upgrades the entity's capabilities instead of printing an error. It can now also change read/write permissions in a capability that the entity already diff --git a/src/rgw/driver/rados/rgw_zone.cc b/src/rgw/driver/rados/rgw_zone.cc index 1e9361c888913..ae7a4d48e5e6b 100644 --- a/src/rgw/driver/rados/rgw_zone.cc +++ b/src/rgw/driver/rados/rgw_zone.cc @@ -532,14 +532,6 @@ int create_realm(const DoutPrefixProvider* dpp, optional_yield y, return r; } - // try to set as default. may race with another create, so pass exclusive=true - // so we don't override an existing default - r = set_default_realm(dpp, y, cfgstore, info, true); - if (r < 0 && r != -EEXIST) { - ldpp_dout(dpp, 0) << "WARNING: failed to set realm as default: " - << cpp_strerror(r) << dendl; - } - if (writer_out) { *writer_out = std::move(writer); } -- 2.39.5