]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: request that delete bucket website should be forward to master zone
authorChang Liu <liuchang0812@gmail.com>
Tue, 28 May 2019 07:38:43 +0000 (15:38 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 24 Jun 2019 10:09:25 +0000 (12:09 +0200)
Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit 52cb0915630ff490352a4733d8a24af2f88f784b)

src/rgw/rgw_op.cc

index 34b07008b05edc2c8b5f84e23d5fabedc9f3d9b3..15aa5506dd291b2bb1d03003a4defe078260f928 100644 (file)
@@ -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();