From: huanwen ren <ren.huanwen@zte.com.cn>
Date: Tue, 11 Oct 2016 11:29:52 +0000 (+0800)
Subject: mgr: mgr::init() return when connection daemons failed
X-Git-Tag: v11.1.0~253^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4a4a7a89b2178b04816f3532da7bb1fe5d26f6b;p=ceph.git

mgr: mgr::init() return when connection daemons failed

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index f0be92a1a9df..b879b00f88a8 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -48,8 +48,10 @@ int DaemonServer::init(uint64_t gid, entity_addr_t client_addr)
   msgr = Messenger::create(g_ceph_context, g_conf->ms_type,
       entity_name_t::MGR(gid), "server", getpid());
   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 --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 834eb9111f66..d22cc43b39cd 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -148,7 +148,11 @@ void Mgr::init()
   assert(!initialized);
 
   // Start communicating with daemons to learn statistics etc
-  server.init(monc->get_global_id(), client_messenger->get_myaddr());
+  int r = server.init(monc->get_global_id(), client_messenger->get_myaddr());
+  if (r < 0) {
+    derr << "Initialize server fail"<< dendl;
+    return;
+  }
   dout(4) << "Initialized server at " << server.get_myaddr() << dendl;
 
   // Preload all daemon metadata (will subsequently keep this