From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 10 May 2021 15:48:48 +0000 (-0400)
Subject: rgw: deprecate the civetweb frontend
X-Git-Tag: v17.1.0~1954^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=248686226bc11e0d2b0d2b8f786b2d7d0ac771e0;p=ceph.git

rgw: deprecate the civetweb frontend

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/doc/radosgw/frontends.rst b/doc/radosgw/frontends.rst
index e4a013590851..124dd9665023 100644
--- 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 25377848dd00..b684021a7a13 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -560,6 +560,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);