rgw: fix modification to index attrs when setting acls

Fixes: #12955
 - add ACL change after initial population
 - populate bufferlist with object attributes

Signed-off-by: Brian Felton <bjfelton@gmail.com>
(cherry picked from commit 7496741ebbd75b74d5ffeca5341cccb2318176e6)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 4301bdde8b4c78829330d39114bdf1a01e5f69d9..2ac298fedafaabde372dddfe6c475908b722ff5c 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2562,8 +2562,17 @@ void RGWPutACLs::execute()
   new_policy.encode(bl);
   obj = rgw_obj(s->bucket, s->object);
   map<string, bufferlist> attrs;
-  attrs[RGW_ATTR_ACL] = bl;
+
   store->set_atomic(s->obj_ctx, obj);
+
+  if (!s->object.empty()) {
+    ret = get_obj_attrs(store, s, obj, attrs);
+    if (ret < 0)
+      return;
+  }
+  
+  attrs[RGW_ATTR_ACL] = bl;
+
   if (!s->object.empty()) {
     ret = store->set_attrs(s->obj_ctx, obj, attrs, NULL, ptracker);
   } else {