msg/async: rename ms_event_ -> ms_async_, drop unused config options

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index c6487bdc2f82f2375d513cebf6f1e312a035c890..3e61b7ba888ce1e55ce42aff420218bd24fb59f7 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -139,9 +139,7 @@ OPTION(ms_inject_delay_probability, OPT_DOUBLE, 0) // range [0, 1]
 OPTION(ms_inject_internal_delays, OPT_DOUBLE, 0)   // seconds
 OPTION(ms_dump_on_send, OPT_BOOL, false)           // hexdump msg to log on send
 OPTION(ms_dump_corrupt_message_level, OPT_INT, 1)  // debug level to hexdump undecodeable messages at
-OPTION(ms_event_op_threads, OPT_INT, 2)
-OPTION(ms_event_thread_timeout, OPT_INT, 15)
-OPTION(ms_event_thread_suicide_timeout, OPT_INT, 180)
+OPTION(ms_async_op_threads, OPT_INT, 2)
 
 OPTION(inject_early_sigterm, OPT_BOOL, false)
 

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index baf4027966800f5ae9dfb88ddde39e1f16b65042..3a8eb04f7cefc18eb19258c6a71db07244214179 100644 (file)
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -321,7 +321,7 @@ AsyncMessenger::AsyncMessenger(CephContext *cct, entity_name_t name,
     cluster_protocol(0), stopped(true)
 {
   ceph_spin_init(&global_seq_lock);
-  for (int i = 0; i < cct->_conf->ms_event_op_threads; ++i) {
+  for (int i = 0; i < cct->_conf->ms_async_op_threads; ++i) {
     Worker *w = new Worker(this, cct);
     workers.push_back(w);
   }