From: Sage Weil <sage@redhat.com>
Date: Sat, 4 Oct 2014 00:59:40 +0000 (-0700)
Subject: msg: make messenger type configurable
X-Git-Tag: v0.88~105^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69acc8ae02eb54b320e97e758fd9cd60ad66f541;p=ceph.git

msg: make messenger type configurable

Eventaully we may want to override this by passing the type in as an
arg, but let's do that later.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index d2131d005fef..38c25a2bef7b 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -113,6 +113,7 @@ OPTION(heartbeat_file, OPT_STR, "")
 OPTION(heartbeat_inject_failure, OPT_INT, 0)    // force an unhealthy heartbeat for N seconds
 OPTION(perf, OPT_BOOL, true)       // enable internal perf counters
 
+OPTION(ms_type, OPT_STR, "simple")   // messenger backend
 OPTION(ms_tcp_nodelay, OPT_BOOL, true)
 OPTION(ms_tcp_rcvbuf, OPT_INT, 0)
 OPTION(ms_tcp_prefetch_max_size, OPT_INT, 4096) // max prefetch size, we limit this to avoid extra memcpy
diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index b80782de518d..1b6872054123 100644
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -9,5 +9,8 @@ Messenger *Messenger::create(CephContext *cct,
 			     string lname,
 			     uint64_t nonce)
 {
-  return new SimpleMessenger(cct, name, lname, nonce);
+  if (cct->_conf->ms_type == "simple")
+    return new SimpleMessenger(cct, name, lname, nonce);
+  derr << "unrecognized ms_type '" << cct->_conf->ms_type << "'" << dendl;
+  return NULL;
 }