]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: don't use merge_and_store_attrs() when recreating a bucket
authorCasey Bodley <cbodley@redhat.com>
Wed, 18 Dec 2024 16:28:02 +0000 (11:28 -0500)
committerYuri Weinstein <yweinste@redhat.com>
Tue, 8 Jul 2025 17:23:23 +0000 (17:23 +0000)
commit397e5d5dfc4655eb3cfeb71a02c473710d5a4c71
treeb115c45ad4d02dcd0079a3c07026df61d10a6f9f
parent5f6af7a11a0a2b566b14d98d7dffdc030344964b
rgw: don't use merge_and_store_attrs() when recreating a bucket

https://github.com/ceph/ceph/pull/56583 recently fixed
merge_and_store_attrs() to preserve existing attrs, but this broke the
swift api's ability to remove container metadata. RGWCreateBucket
handles this merging itself with prepare_add_del_attrs(), so we should
just assign createparams.attrs to the bucket and store it with
bucket->put_info()

make the same change for RGWPutMetadataBucket which swift uses to
add/remove existing metadata

Fixes: https://tracker.ceph.com/issues/69301
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 340e353de6882dcd6e327d6691da9ef2b767ab4f)
(cherry picked from commit c5887a763b41aad5d89955e88337288f1019cccc)
src/rgw/rgw_op.cc