]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ms: mark async messenger experimental
authorSage Weil <sage@redhat.com>
Mon, 29 Dec 2014 19:37:59 +0000 (11:37 -0800)
committerSage Weil <sage@redhat.com>
Mon, 29 Dec 2014 22:19:14 +0000 (14:19 -0800)
Signed-off-by: Sage Weil <sage@redhat.com>
src/msg/Messenger.cc

index e079ec3c577a63b093f153cac881425a8e2a561d..cec5bbf26aa0ad5ff6b5c103a8ecd79fccb92d94 100644 (file)
@@ -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;