From: Chang Liu <liuchang0812@gmail.com>
Date: Tue, 28 May 2019 08:46:18 +0000 (+0800)
Subject: rgw: DeleteLC should be forwarded to master zone
X-Git-Tag: v14.2.3~133^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=512608985603406f02f90cebdc451e2b5bbe2744;p=ceph.git

rgw: DeleteLC should be forwarded to master zone

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit f75087fd73ae7fe5818b0620c53865b78b9cd0a9)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 6ad6cc321f1..19c07140f33 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5259,6 +5259,14 @@ void RGWPutLC::execute()
 
 void RGWDeleteLC::execute()
 {
+  if (!store->svc.zone->is_meta_master()) {
+    bufferlist data;
+    op_ret = forward_request_to_master(s, nullptr, store, data, nullptr);
+    if (op_ret < 0) {
+      ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl;
+      return;
+    }
+  }
   map<string, bufferlist> attrs = s->bucket_attrs;
   attrs.erase(RGW_ATTR_LC);
   op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,