Merge remote branch 'gh/master' into wip-op-data-mux

1 files changed, 9 insertions, 2 deletions

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 004745b4649..02195b21c12 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -64,7 +64,9 @@ static int do_cmds_special_action(const std::string &action,
 				  const std::string &dump_file, int rank)
 {
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
-  messenger->bind(g_conf->public_addr, getpid());
+  int r = messenger->bind(g_conf->public_addr, getpid());
+  if (r < 0)
+    return r;
   MonClient mc(g_ceph_context);
   if (mc.build_initial_monmap() < 0)
     return -1;
@@ -211,7 +213,12 @@ int main(int argc, const char **argv)
   global_print_banner();
 
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
-  messenger->bind(g_conf->public_addr, getpid());
+  messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL);
+
+  int r = messenger->bind(g_conf->public_addr, getpid());
+  if (r < 0)
+    exit(1);
+
   cout << "starting " << g_conf->name << " at " << messenger->get_ms_addr()
        << std::endl;
   messenger->register_entity(entity_name_t::MDS(-1));