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 d6ee772bc2e72f84f2fef7d08acdf11b31e457a0..f97316c28f73208273d0bb40ac28447f5888ef0c 100644 (file)
--- 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;
   }