From 0ec3be56d14da9d958f682a4d59f1e6d0886d264 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 10 May 2021 11:48:48 -0400 Subject: [PATCH] rgw: deprecate the civetweb frontend Fixes: https://tracker.ceph.com/issues/50758 Signed-off-by: Casey Bodley (cherry picked from commit 248686226bc11e0d2b0d2b8f786b2d7d0ac771e0) Conflicts: PendingReleaseNotes added for pacific --- PendingReleaseNotes | 2 ++ doc/radosgw/frontends.rst | 1 + src/rgw/rgw_main.cc | 2 ++ 3 files changed, 5 insertions(+) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 1963b699d74..7948d5d85c8 100644 --- 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 e4a01359085..124dd966502 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 8b0bbb663e9..284a5387c09 100644 --- 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); -- 2.47.3