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>

diff --cc src/mgr/DaemonServer.cc
index 53740868dc5d1768cda1ffb79fbf8625247636e3,b879b00f88a83bb4b2bf52af5887c02fcafc932b..061d5f45f16be24a5eb241d18a47f9f33c3a4464
--- 1/src/mgr/DaemonServer.cc
--- 2/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);

diff --cc src/mgr/Mgr.cc
Simple merge

diff --cc src/mgr/MgrStandby.cc
Simple merge