From: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Date: Wed, 6 Jul 2022 01:27:00 +0000 (-0700)
Subject: Merge branch 'main' into front_confg
X-Git-Tag: v18.0.0~561^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98fa07829dcccbe1d4ee2a84a74143bc7083bc25;p=ceph.git

Merge branch 'main' into front_confg
---

98fa07829dcccbe1d4ee2a84a74143bc7083bc25
diff --cc doc/radosgw/frontends.rst
index 09769567e6b9,5c6900f54489..45b29cb6fd87
--- a/doc/radosgw/frontends.rst
+++ b/doc/radosgw/frontends.rst
@@@ -95,91 -127,13 +127,22 @@@ Option
  :Type: Integer
  :Default: ``65000``
  
 +``rgw_thread_pool_size``
 +
 +:Description: Sets the number of threads spawned by Beast to handle
 +              incoming HTTP connections. This effectively limits the number
 +              of concurrent connections that the frontend can service.
 +
 +:Type: Integer
 +:Default: ``512``
 +
- Civetweb
- ========
- 
- .. versionadded:: Firefly
- 
- The ``civetweb`` frontend uses the Civetweb HTTP library, which is a
- fork of Mongoose.
- 
- 
- Options
- -------
- 
- ``port``
- 
- :Description: Sets the listening port number. For SSL-enabled ports, add an
-               ``s`` suffix like ``443s``. To bind a specific IPv4 or IPv6
-               address, use the form ``address:port``. Multiple endpoints
-               can either be separated by ``+`` as in ``127.0.0.1:8000+443s``,
-               or by providing multiple options as in ``port=8000 port=443s``.
- 
- :Type: String
- :Default: ``7480``
- 
+ ``max_header_size``
  
- ``num_threads``
- 
- :Description: Sets the number of threads spawned by Civetweb to handle
-               incoming HTTP connections. This effectively limits the number
-               of concurrent connections that the frontend can service.
- 
- :Type: Integer
- :Default: ``rgw_thread_pool_size``
- 
- 
- ``request_timeout_ms``
- 
- :Description: The amount of time in milliseconds that Civetweb will wait
-               for more incoming data before giving up.
+ :Description: The maximum number of header bytes available for a single request.
  
  :Type: Integer
- :Default: ``30000``
- 
- 
- ``ssl_certificate``
- 
- :Description: Path to the SSL certificate file used for SSL-enabled ports.
- 
- :Type: String
- :Default: None
- 
- ``access_log_file``
- 
- :Description: Path to a file for access logs. Either full path, or relative
- 			  to the current working directory. If absent (default), then
- 			  accesses are not logged.
- 
- :Type: String
- :Default: ``EMPTY``
- 
- 
- ``error_log_file``
- 
- :Description: Path to a file for error logs. Either full path, or relative
- 			  to the current working directory. If absent (default), then
- 			  errors are not logged.
- 
- :Type: String
- :Default: ``EMPTY``
- 
- 
- The following is an example of the ``/etc/ceph/ceph.conf`` file with some of these options set: ::
-  
-  [client.rgw.gateway-node1]
-  rgw_frontends = civetweb request_timeout_ms=30000 error_log_file=/var/log/radosgw/civetweb.error.log access_log_file=/var/log/radosgw/civetweb.access.log
- 
- A complete list of supported options can be found in the `Civetweb User Manual`_.
+ :Default: ``16384``
+ :Maximum: ``65536``
  
  
  Generic Options