From: Haomai Wang <haomai@xsky.com>
Date: Thu, 2 Feb 2017 08:22:04 +0000 (+0800)
Subject: ceph_mds: adopt ms public type
X-Git-Tag: v12.0.0~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ab97f66bdcc63fd34d49a55f0981f99c8912347;p=ceph.git

ceph_mds: adopt ms public type

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 4cd951918ad2..4ba914b2d189 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -143,7 +143,8 @@ int main(int argc, const char **argv)
   uint64_t nonce = 0;
   get_random_bytes((char*)&nonce, sizeof(nonce));
 
-  Messenger *msgr = Messenger::create(g_ceph_context, g_conf->ms_type,
+  std::string public_msgr_type = g_conf->ms_public_type.empty() ? g_conf->ms_type : g_conf->ms_public_type;
+  Messenger *msgr = Messenger::create(g_ceph_context, public_msgr_type,
 				      entity_name_t::MDS(-1), "mds",
 				      nonce, Messenger::HAS_MANY_CONNECTIONS);
   if (!msgr)