From: Adam C. Emerson Date: Wed, 23 Jan 2019 19:20:33 +0000 (-0500) Subject: rgw: Remove rgw_num_rados_handles option X-Git-Tag: v15.0.0~126^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=55180511e5e5a2d9965a1bad17218ee64e023484;p=ceph-ci.git 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 --- diff --git a/PendingReleaseNotes b/PendingReleaseNotes index e69de29bb2d..6c1ad0af2c2 100644 --- 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 37bb8eea900..0e20dfd5a24 100644 --- 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 a68ea412a48..3535b361659 100644 --- 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 1bca970f570..967281ab683 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1407,7 +1407,7 @@ int RGWRados::init_rados() } } - auto handles = std::vector{static_cast(cct->_conf->rgw_num_rados_handles)}; + auto handles = std::vector{static_cast(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 f2f3de69ee5..2be1070d95f 100644 --- 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{static_cast(cct->_conf->rgw_num_rados_handles)}; + auto handles = std::vector{static_cast(1)}; for (auto& r : handles) { int ret = r.init_with_context(cct);