rgw: reduce default thread pool size

Fixes: https://tracker.ceph.com/issues/65656
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit d22252b6b5a1948543bf69f6ce6a34b7a4f70104)
Fixes: https://tracker.ceph.com/issues/77714
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 03eec9ffa1b49527a30e8c307a41a69159ae5bdc..97f0e60cbcd4aa0d3d5e67be50af0896cee43128 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -30,6 +30,12 @@
     If the default provider is required when also using custom providers,
     it must be explicitly loaded in the configuration file or code (see https://github.com/openssl/openssl/blob/master/README-PROVIDERS.md).
 * RGW: Fixed bucket notification events so the 'x_amz_request_id' in NotificationEvent now matches the 'x_amz_request_id' returned by the corresponding S3 operation.
+* RGW: The rgw_gc_max_deferred and rgw_gc_max_deferred_entries_size options have been removed, as they did not do anything.
+  - Updated the default for rgw_gc_max_queue_size to account for the extra space from removing rgw_gc_max_deferred_entries_size.
+* RGW: The default value of ``rgw_thread_pool_size`` has been reduced from 512 to 128.
+  Benchmarks showed that the lower thread count improves throughput and reduces latency
+  on NVMe and HDD based environments. Users with specific workload requirements can
+  tune this value; see also ``rgw_max_concurrent_requests``.
 
 
 * DASHBOARD: A new Overview landing page provides an at-a-glance cluster summary

diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index d9111ffeb071f6c61f1d89b367308c9502cce165..cb61ac25d0992c947112d73bbc380333d9d4f14d 100644 (file)
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -1282,9 +1282,11 @@ options:
     is, RGW will be able to deal with more concurrent requests at the cost of more
     resource utilization.
   fmt_desc: The size of the thread pool.
-  default: 512
+  default: 128
   services:
   - rgw
+  see_also:
+  - rgw_max_concurrent_requests
   with_legacy: true
 - name: rgw_num_control_oids
   type: int
@@ -3867,6 +3869,7 @@ options:
   - rgw
   see_also:
   - rgw_frontends
+  - rgw_thread_pool_size
 - name: rgw_scheduler_type
   type: str
   level: advanced