rgw: Remove rgw_num_rados_handles option

This has been deprecated for some time and underlies much of the
complexity of the RADOS service.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6c1ad0af2c2449f4219b38c9433bd4efa01cc28e 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -0,0 +1,8 @@
+>=15.0.0
+--------
+
+* The RGW "num_rados_handles" has been removed.
+  * If you were using a value of "num_rados_handles" greater than 1
+    multiply your current "objecter_inflight_ops" and 
+    "objecter_inflight_op_bytes" paramaeters by the old
+    "num_rados_handles" to get the same throttle behavior.

diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index 37bb8eea9007e3229dc007d7af5f9bafa98c179e..0e20dfd5a24d7dad1c8111e8bbdaa87b41f9da47 100644 (file)
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -157,18 +157,6 @@ instances or all radosgw-admin commands can be put into the ``[global]`` or the
 :Default: 100 threads.
 
 
-``rgw num rados handles``
-
-:Description: The number of `RADOS cluster handles`_ for Ceph Object Gateway.
-              Having a configurable number of RADOS handles is resulting in
-              significant performance boost for all types of workloads. Each RGW
-              worker thread would now get to pick a RADOS handle for its lifetime,
-              from the available bunch.
-
-:Type: Integer
-:Default: ``1``
-
-
 ``rgw num control oids``
 
 :Description: The number of notification objects used for cache synchronization

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index a68ea412a481b857d834e485d85ee5e85ea8a6ce..3535b3616599b8a66a0cbc835c856b95bb88c6f7 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1369,7 +1369,6 @@ OPTION(rgw_op_thread_timeout, OPT_INT)
 OPTION(rgw_op_thread_suicide_timeout, OPT_INT)
 OPTION(rgw_thread_pool_size, OPT_INT)
 OPTION(rgw_num_control_oids, OPT_INT)
-OPTION(rgw_num_rados_handles, OPT_U32)
 OPTION(rgw_verify_ssl, OPT_BOOL) // should http_client try to verify ssl when sent https request
 
 /* The following are tunables for caches of RGW NFS (and other file

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 1bca970f5707dbabe9087f43df63343770a6220c..967281ab683f49f5695d79f07679e638990866ca 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1407,7 +1407,7 @@ int RGWRados::init_rados()
     }
   }
 
-  auto handles = std::vector<librados::Rados>{static_cast<size_t>(cct->_conf->rgw_num_rados_handles)};
+  auto handles = std::vector<librados::Rados>{static_cast<size_t>(1)};
 
   for (auto& r : handles) {
     ret = r.init_with_context(cct);

diff --git a/src/rgw/services/svc_rados.cc b/src/rgw/services/svc_rados.cc
index f2f3de69ee576ee92e3ab2f50025540d1db0361e..2be1070d95ff312d1d62404a533003fdf32c8d24 100644 (file)
--- a/src/rgw/services/svc_rados.cc
+++ b/src/rgw/services/svc_rados.cc
@@ -44,7 +44,7 @@ static int init_ioctx(CephContext *cct, librados::Rados *rados, const rgw_pool&
 
 int RGWSI_RADOS::do_start()
 {
-  auto handles = std::vector<librados::Rados>{static_cast<size_t>(cct->_conf->rgw_num_rados_handles)};
+  auto handles = std::vector<librados::Rados>{static_cast<size_t>(1)};
 
   for (auto& r : handles) {
     int ret = r.init_with_context(cct);