]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
rgw/lc: stop using merge_and_store_attrs in remove_bucket_config
authorCasey Bodley <cbodley@redhat.com>
Fri, 25 Apr 2025 17:38:50 +0000 (13:38 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 29 Jul 2025 14:10:51 +0000 (10:10 -0400)
commit36bc8e4242a352830dce516f4b40e3dfa0de72f5
treef6edaf29ba2aa52243821b4b54ea96f8c32ad883
parentafe6433662328f115fd036de09dab2f67b0bef46
rgw/lc: stop using merge_and_store_attrs in remove_bucket_config

merge_and_store_attrs() is no longer able to remove xattrs. change the
sal::Bucket's attrs manually and call put_info() to write them back

Fixes: https://tracker.ceph.com/issues/71083
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f3cc52124c650d32be2adf3cf540167142423c42)

Conflicts:
src/rgw/driver/rados/rgw_bucket.cc
src/rgw/driver/rados/rgw_sal_rados.cc
src/rgw/rgw_lc.cc
src/rgw/rgw_lc.h
src/rgw/rgw_op.cc
  mostly because squid doesn't have changes to remove metadata backends
src/rgw/driver/rados/rgw_bucket.cc
src/rgw/driver/rados/rgw_sal_rados.cc
src/rgw/rgw_lc.cc
src/rgw/rgw_lc.h
src/rgw/rgw_op.cc