From: Chang Liu <liuchang0812@gmail.com>
Date: Thu, 19 Sep 2019 06:56:02 +0000 (+0800)
Subject: rgw: the http response code of delete bucket should not be 204-no-content
X-Git-Tag: v14.2.8~78^2~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41ebfb259d37988ff40ee2b5f7a0008716ec1f39;p=ceph.git

rgw: the http response code of delete bucket should not be 204-no-content

Fixes: https://tracker.ceph.com/issues/41925

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

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 4c2d9167efb2..32d53cc7f8d0 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1566,15 +1566,6 @@ void RGWDeleteBucket_ObjStore_S3::send_response()
   set_req_state_err(s, r);
   dump_errno(s);
   end_header(s, this);
-
-  if (s->system_request) {
-    JSONFormatter f; /* use json formatter for system requests output */
-
-    f.open_object_section("info");
-    encode_json("object_ver", objv_tracker.read_version, &f);
-    f.close_section();
-    rgw_flush_formatter_and_reset(s, &f);
-  }
 }
 
 static inline void map_qs_metadata(struct req_state* s)