From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Oct 2014 15:39:31 +0000 (-0700)
Subject: msg/async: rename ms_event_ -> ms_async_, drop unused config options
X-Git-Tag: v0.88~37^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c02563297be84fc2def37a0104db2d9a8c4c3529;p=ceph.git

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 c6487bdc2f82..3e61b7ba888c 100644
--- 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 baf402796680..3a8eb04f7cef 100644
--- 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);
   }