From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Dec 2014 19:37:59 +0000 (-0800)
Subject: ms: mark async messenger experimental
X-Git-Tag: v0.92~88^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55405db5373eaa0d8c424ae577f99eeac7fe45da;p=ceph.git

ms: mark async messenger experimental

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

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index e079ec3c577a..cec5bbf26aa0 100644
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -14,7 +14,8 @@ Messenger *Messenger::create(CephContext *cct, const string &type,
     r = rand() % 2;
   if (r == 0 || type == "simple")
     return new SimpleMessenger(cct, name, lname, nonce);
-  else if (r == 1 || type == "async")
+  else if ((r == 1 || type == "async") &&
+	   cct->check_experimental_feature_enabled("ms-type-async"))
     return new AsyncMessenger(cct, name, lname, nonce);
   lderr(cct) << "unrecognized ms_type '" << cct->_conf->ms_type << "'" << dendl;
   return NULL;