From: Samuel Just <sjust@redhat.com>
Date: Wed, 22 Jun 2016 18:21:16 +0000 (-0700)
Subject: Revert "msg: default ms type = async"
X-Git-Tag: v11.0.0~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73e67eb6f6ffd9696046c5f6adb51feca2369f36;p=ceph.git

Revert "msg: default ms type = async"

Not ready quite yet, causing too many test failures.

This reverts commit 928887a09c2cb9944531165fcf4aa9026b49a3d9.
Reviewed-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index e499cdb5f856..1ad952061354 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -166,7 +166,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, "async")   // messenger backend
+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