Merge pull request ceph#52960 from cbodley/wip-62411

rgw/lc: remove_bucket_config() doesn't update xattrs on bucket delete

Reviewed-by Matt Benjamin <[email protected]>

Author: cbodley

src/rgw/driver/rados/rgw_sal_rados.cc

@@ -456,8 +456,11 @@ int RadosBucket::remove_bucket(const DoutPrefixProvider* dpp,
   }
 
   // remove lifecycle config, if any (XXX note could be made generic)
-  (void) store->getRados()->get_lc()->remove_bucket_config(
-    this, get_attrs());
+  if (get_attrs().count(RGW_ATTR_LC)) {
+    constexpr bool merge_attrs = false; // don't update xattrs, we're deleting
+    (void) store->getRados()->get_lc()->remove_bucket_config(
+      this, get_attrs(), merge_attrs);
+  }
 
   ret = store->ctl()->bucket->sync_user_stats(dpp, info.owner, info, y, nullptr);
   if (ret < 0) {