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: testing/wip-vshankar-testing-20241219.063429-debug~19^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5c7d47af5577389d00fc81e455669328ba7ac224;p=ceph-ci.git

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

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
---

diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index d3af42cf2ec..0e4f95846d1 100644
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -271,7 +271,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;
   }