From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 17 Nov 2016 11:40:53 +0000 (+0800)
Subject: Merge pull request #11424 from renhwztetecs/renhw-wip-mgr
X-Git-Tag: v11.1.0~253
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e445953379eb534d7c162ac43780193cfbde903e;p=ceph.git

Merge pull request #11424 from renhwztetecs/renhw-wip-mgr

mgr: init() return when connection daemons failed && add some err info

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

e445953379eb534d7c162ac43780193cfbde903e
diff --cc src/mgr/DaemonServer.cc
index 53740868dc5d,b879b00f88a8..061d5f45f16b
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@@ -46,10 -46,12 +46,12 @@@ int DaemonServer::init(uint64_t gid, en
  {
    // Initialize Messenger
    msgr = Messenger::create(g_ceph_context, g_conf->ms_type,
 -      entity_name_t::MGR(gid), "server", getpid());
 +			   entity_name_t::MGR(gid), "server", getpid(), 0);
    int r = msgr->bind(g_conf->public_addr);
-   if (r < 0)
+   if (r < 0) {
+     derr << "unable to bind mgr to " << g_conf->public_addr << dendl;
      return r;
+   }
  
    msgr->set_myname(entity_name_t::MGR(gid));
    msgr->set_addr_unknowns(client_addr);