From: Chang Liu <liuchang0812@gmail.com>
Date: Tue, 28 May 2019 07:38:43 +0000 (+0800)
Subject: rgw: request that delete bucket website should be forward to master zone
X-Git-Tag: v14.2.3~133^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50062ecde08abbe6e3a569d6e9873350b66d92ec;p=ceph.git

rgw: request that delete bucket website should be forward to master zone

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 34b07008b05..15aa5506dd2 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2543,6 +2543,16 @@ void RGWDeleteBucketWebsite::pre_exec()
 
 void RGWDeleteBucketWebsite::execute()
 {
+
+  if (!store->svc.zone->is_meta_master()) {
+    bufferlist in_data;
+    op_ret = forward_request_to_master(s, nullptr, store, in_data, nullptr);
+    if (op_ret < 0) {
+      ldpp_dout(this, 0) << "NOTICE: forward_to_master failed on bucket=" << s->bucket.name 
+	                 << "returned err=" << op_ret << dendl;
+      return;
+    }
+  }
   op_ret = retry_raced_bucket_write(store, s, [this] {
       s->bucket_info.has_website = false;
       s->bucket_info.website_conf = RGWBucketWebsiteConf();