rgw: deprecate the civetweb frontend

Fixes: https://tracker.ceph.com/issues/50758
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 248686226bc11e0d2b0d2b8f786b2d7d0ac771e0)

Conflicts:
  PendingReleaseNotes added for pacific

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 1963b699d743eb0533119df943f42c4ca6e89db4..7948d5d85c814ab57f2c9205010d48f3845a6dd0 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -122,6 +122,8 @@
   CentOS 7.6 and later.  To enable older clients, set ``cephx_require_version``
   and ``cephx_service_require_version`` config options to 1.
 
+* rgw: The Civetweb frontend is now deprecated and will be removed in Quincy.
+
 >=15.0.0
 --------
 

diff --git a/doc/radosgw/frontends.rst b/doc/radosgw/frontends.rst
index e4a013590851c06fbe815352bd7e551c42d94791..124dd9665023928e108cf5452f1896c172b65c81 100644 (file)
--- a/doc/radosgw/frontends.rst
+++ b/doc/radosgw/frontends.rst
@@ -100,6 +100,7 @@ Civetweb
 ========
 
 .. versionadded:: Firefly
+.. deprecated:: Pacific
 
 The ``civetweb`` frontend uses the Civetweb HTTP library, which is a
 fork of Mongoose.

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 8b0bbb663e90ae0640ada12f8232861bb1568ffc..284a5387c092376453b360d96843a0833fda9b10 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -557,6 +557,8 @@ int radosgw_Main(int argc, const char **argv)
     RGWFrontend *fe = NULL;
 
     if (framework == "civetweb" || framework == "mongoose") {
+      lderr(cct.get()) << "IMPORTANT: the civetweb frontend is now deprecated "
+          "and will be removed in a future release" << dendl;
       framework = "civetweb";
       std::string uri_prefix;
       config->get_val("prefix", "", &uri_prefix);