From: Haomai Wang Date: Fri, 12 Sep 2014 07:52:06 +0000 (+0800) Subject: Add event option X-Git-Tag: v0.88~37^2~4^2~37 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=071ba4a782bb23a710bcf86ee9aa6940f7691324;p=ceph.git Add event option Signed-off-by: Haomai Wang --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 9376b759041..980e74afe86 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -142,6 +142,7 @@ OPTION(ms_dump_corrupt_message_level, OPT_INT, 1) // debug level to hexdump und 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_use_event, OPT_BOOL, false) OPTION(inject_early_sigterm, OPT_BOOL, false) diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc index 8be11d44ac7..21ccea1d2fa 100644 --- a/src/msg/Messenger.cc +++ b/src/msg/Messenger.cc @@ -3,6 +3,7 @@ #include "Messenger.h" #include "msg/simple/SimpleMessenger.h" +#include "AsyncMessenger.h" Messenger *Messenger::create(CephContext *cct, entity_name_t name, @@ -11,6 +12,8 @@ Messenger *Messenger::create(CephContext *cct, { if (cct->_conf->ms_type == "simple") return new SimpleMessenger(cct, name, lname, nonce); + else if (cct->_conf->ms_type == "async") + return new AsyncMessenger(cct, name, lname, nonce); lderr(cct) << "unrecognized ms_type '" << cct->_conf->ms_type << "'" << dendl; return NULL; }