From: Kefu Chai <kchai@redhat.com>
Date: Fri, 26 Feb 2021 03:26:47 +0000 (+0800)
Subject: common/options: drop ms_async_max_op_threads
X-Git-Tag: v16.2.15~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dd94f2d9316b5b11b5b7a994810f54c539d01d3;p=ceph.git

common/options: drop ms_async_max_op_threads

the last user of this option was DPDKStack::DPDKStack(). which used it
to initialize its func vector. but this option is not used anymore.

so let's drop it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ee7184639dcd7b8fc0ed5a189bc764151e601437)
---

diff --git a/doc/rados/configuration/ms-ref.rst b/doc/rados/configuration/ms-ref.rst
index 113bd09137bf..6ccdebaf1c47 100644
--- a/doc/rados/configuration/ms-ref.rst
+++ b/doc/rados/configuration/ms-ref.rst
@@ -109,17 +109,6 @@ Async messenger options
 :Default: ``3``
 
 
-``ms_async_max_op_threads``
-
-:Description: Maximum number of worker threads used by each Async Messenger instance. 
-              Set to lower values when your machine has limited CPU count, and increase 
-              when your CPUs are underutilized (i. e. one or more of CPUs are
-              constantly on 100% load during I/O operations).
-:Type: 64-bit Unsigned Integer
-:Required: No
-:Default: ``5``
-
-
 ``ms_async_send_inline``
 
 :Description: Send messages directly from the thread that generated them instead of
@@ -129,5 +118,3 @@ Async messenger options
 :Type: Boolean
 :Required: No
 :Default: ``false``
-
-
diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 99d0aad95b21..0e3b4c8ef953 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -144,7 +144,6 @@ OPTION(ms_blackhole_client, OPT_BOOL)
 OPTION(ms_dump_on_send, OPT_BOOL)           // hexdump msg to log on send
 OPTION(ms_dump_corrupt_message_level, OPT_INT)  // debug level to hexdump undecodeable messages at
 OPTION(ms_async_op_threads, OPT_U64)            // number of worker processing threads for async messenger created on init
-OPTION(ms_async_max_op_threads, OPT_U64)        // max number of worker processing threads for async messenger
 OPTION(ms_async_rdma_device_name, OPT_STR)
 OPTION(ms_async_rdma_enable_hugepage, OPT_BOOL)
 OPTION(ms_async_rdma_buffer_size, OPT_INT)
diff --git a/src/common/options.cc b/src/common/options.cc
index d3f0166ffb18..2c4f7bef4aa5 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1149,11 +1149,6 @@ std::vector<Option> get_global_options() {
     .set_min_max(1, 24)
     .set_description("Threadpool size for AsyncMessenger (ms_type=async)"),
 
-    Option("ms_async_max_op_threads", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(5)
-    .set_description("Maximum threadpool size of AsyncMessenger")
-    .add_see_also("ms_async_op_threads"),
-
     Option("ms_async_reap_threshold", Option::TYPE_UINT, Option::LEVEL_DEV)
     .set_default(5)
     .set_min(1)