From: David Zafman Date: Thu, 30 Mar 2017 00:35:51 +0000 (-0700) Subject: common: Remove unused config option osd_recovery_threads X-Git-Tag: v12.0.2~51^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79a4ac41c5fd6613e5b9a51de595a7043425916d;p=ceph.git common: Remove unused config option osd_recovery_threads Signed-off-by: David Zafman --- diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst index 06e46a6eab9c..d68316dff603 100644 --- a/doc/rados/configuration/osd-config-ref.rst +++ b/doc/rados/configuration/osd-config-ref.rst @@ -673,13 +673,6 @@ perform well in a degraded state. :Default: ``8 << 20`` -``osd recovery threads`` - -:Description: The number of threads for recovering data. -:Type: 32-bit Integer -:Default: ``1`` - - ``osd recovery thread timeout`` :Description: The maximum time in seconds before timing out a recovery thread. diff --git a/doc/rados/operations/monitoring-osd-pg.rst b/doc/rados/operations/monitoring-osd-pg.rst index 866ae8313ba4..37f1960cba6b 100644 --- a/doc/rados/operations/monitoring-osd-pg.rst +++ b/doc/rados/operations/monitoring-osd-pg.rst @@ -468,8 +468,7 @@ Ceph provides a number of settings to balance the resource contention between new service requests and the need to recover data objects and restore the placement groups to the current state. The ``osd recovery delay start`` setting allows an OSD to restart, re-peer and even process some replay requests before -starting the recovery process. The ``osd recovery threads`` setting limits the -number of threads for the recovery process (1 thread by default). The ``osd +starting the recovery process. The ``osd recovery thread timeout`` sets a thread timeout, because multiple OSDs may fail, restart and re-peer at staggered rates. The ``osd recovery max active`` setting limits the number of recovery requests an OSD will entertain simultaneously to diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 974ee7efd337..3de8c42ee894 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -742,7 +742,6 @@ OPTION(osd_op_pq_min_cost, OPT_U64, 65536) OPTION(osd_disk_threads, OPT_INT, 1) OPTION(osd_disk_thread_ioprio_class, OPT_STR, "") // rt realtime be best effort idle OPTION(osd_disk_thread_ioprio_priority, OPT_INT, -1) // 0-7 -OPTION(osd_recovery_threads, OPT_INT, 1) OPTION(osd_recover_clone_overlap, OPT_BOOL, true) // preserve clone_overlap during recovery/migration OPTION(osd_op_num_threads_per_shard, OPT_INT, 2) OPTION(osd_op_num_shards, OPT_INT, 5)