rgw: fix update of already existing account/bucket's custom attributes.

Introduced in: 3f3b18bff16f6a5b36987f888ba3f2a0d1ea3155.
Fixes: http://tracker.ceph.com/issues/15977
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit d6129e664fc8d25e70bfaf83e340703005f8f73f)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 30764799a76f4e6cc4c61aba849c8ca2bb7e5821..0c22e894fadefdb4f51c8a750d50ec35cd573745 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1857,7 +1857,9 @@ static void prepare_add_del_attrs(const map<string, bufferlist>& orig_attrs,
           out_attrs.erase(aiter);
         }
       } else {
-        out_attrs[name] = kv.second;
+        /* emplace() won't alter the map if the key is already present.
+         * This behaviour is fully intensional here. */
+        out_attrs.emplace(kv);
       }
     } else if (out_attrs.find(name) == std::end(out_attrs)) {
       out_attrs[name] = kv.second;