From: Guo Zhandong <guozhandong@cmss.chinamobile.com>
Date: Wed, 22 Mar 2017 10:00:37 +0000 (+0800)
Subject: rgw: enable to update acl of bucket created in slave zonegroup
X-Git-Tag: v12.0.2~320^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14082%2Fhead;p=ceph.git

rgw: enable to update acl of bucket created in slave zonegroup

Fixes: http://tracker.ceph.com/issues/16888

Signed-off-by: Guo Zhandong <guozhandong@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index aaf7f96438cf..1443f68deb57 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4189,6 +4189,16 @@ void RGWPutACLs::execute()
     return;
   }
 
+  if (s->object.empty() && !store->is_meta_master()) {
+    bufferlist in_data;
+    in_data.append(data, len);
+    op_ret = forward_request_to_master(s, NULL, store, in_data, NULL);
+    if (op_ret < 0) {
+      ldout(s->cct, 20) << __func__ << "forward_request_to_master returned ret=" << op_ret << dendl;
+      return;
+    }
+  }
+
   if (s->cct->_conf->subsys.should_gather(ceph_subsys_rgw, 15)) {
     ldout(s->cct, 15) << "Old AccessControlPolicy";
     policy->to_xml(*_dout);