rgw: realm create only sets default realm on --default

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit d64e273de1623fe784a3b8c9d2c21990f78b7be2)
(cherry picked from commit e76f2718879b8d63faefbee99e4502cef214faff)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 36c697238a79b1419b0d00c63896d52d6eba6d39..1b597500de41651f17b5d0f5a0e9f56b3de522e8 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -79,6 +79,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 2c504712381c52785e3018c3e78f6641d2a70e3f..40f9c451c08e1582d21d339a5b77decda407332c 100644 (file)
--- 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);
   }