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 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 25377848dd00365faa5bd961132ae0cf8b7b9df4..b684021a7a13bbfc7a3da00b59bcee28f0e9d7c9 100644 (file)
--- 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);