]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_mds: adopt ms public type 12023/head
authorHaomai Wang <haomai@xsky.com>
Thu, 2 Feb 2017 08:22:04 +0000 (16:22 +0800)
committerHaomai Wang <haomai@xsky.com>
Thu, 2 Feb 2017 08:22:04 +0000 (16:22 +0800)
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/ceph_mds.cc

index 4cd951918ad205bf0fbfbe0bc0b6c1f4a5136fd6..4ba914b2d1894354608f5b6cdaa0979cb09ae74e 100644 (file)
@@ -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)