rgw: fix RGWPutBucketPolicy error when set BucketPolicy again without delete pre...

Fixes: http://tracker.ceph.com/issues/20252
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 0118aca0c3234df73d3833ae5fbd187dfc3eee02..9bdf62ace951f28977a7bb59f57e355c634e70f3 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6507,6 +6507,7 @@ void RGWPutBucketPolicy::execute()
     Policy p(s->cct, s->bucket_tenant,
             bufferlist::static_from_mem(data, len));
     auto attrs = s->bucket_attrs;
+    attrs[RGW_ATTR_IAM_POLICY].clear();
     attrs[RGW_ATTR_IAM_POLICY].append(p.text);
     op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
                                  &s->bucket_info.objv_tracker);