From: Pritha Srivastava <prsrivas@redhat.com>
Date: Fri, 5 Apr 2024 05:06:42 +0000 (+0530)
Subject: rgw/dbstore: correcting merge_and_store_attrs to store attrs
X-Git-Tag: v19.2.3~188^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57e1adb29aa783f54b913c03a7783b271be506f8;p=ceph.git

rgw/dbstore: correcting merge_and_store_attrs to store attrs
in place of new_attrs.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 5c7d47af5577389d00fc81e455669328ba7ac224)
---

diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index d6ee772bc2e7..f97316c28f73 100644
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -269,7 +269,7 @@ namespace rgw::sal {
 
     /* XXX: handle has_instance_obj like in set_bucket_instance_attrs() */
 
-    ret = store->getDB()->update_bucket(dpp, "attrs", info, false, nullptr, &new_attrs, nullptr, &get_info().objv_tracker);
+    ret = store->getDB()->update_bucket(dpp, "attrs", info, false, nullptr, &attrs, nullptr, &get_info().objv_tracker);
 
     return ret;
   }