From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 13 Dec 2023 18:53:46 +0000 (-0500)
Subject: rgw: don't overwrite target attrs checking mpu info
X-Git-Tag: testing/wip-root-testing-20240411.174241~136^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3e168508f891052382af92c4594ce719cb9a4a52;p=ceph-ci.git

rgw: don't overwrite target attrs checking mpu info

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 97445bb6ea24275de5eb050b55207cad237c81f8)
---

diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc
index b1f1ce8f7ed..9b71334309e 100644
--- a/src/rgw/driver/rados/rgw_sal_rados.cc
+++ b/src/rgw/driver/rados/rgw_sal_rados.cc
@@ -2573,7 +2573,9 @@ int RadosMultipartUpload::complete(const DoutPrefixProvider *dpp,
 
   rgw_placement_rule* ru;
   ru = &placement;
-  ret = RadosMultipartUpload::get_info(dpp, y, &ru, &attrs);
+  rgw::sal::Attrs mpu_attrs; // don't overwrite the target object attrs we are updating
+  ret = RadosMultipartUpload::get_info(dpp, y, &ru, &mpu_attrs);
+
   if (upload_information.obj_retention_exist) {
     bufferlist obj_retention_bl;
     upload_information.obj_retention.encode(obj_retention_bl);