From: Wei Feng <feng.wei@h3c.com>
Date: Mon, 21 Dec 2015 06:35:54 +0000 (-0500)
Subject: mds: we should wait messenger when MDSDaemon suicide
X-Git-Tag: v10.0.3~175^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fff49412c5dfd245fd3f690a62c6800319e14017;p=ceph.git

mds: we should wait messenger when MDSDaemon suicide

Signed-off-by: Wei Feng <feng.wei@h3c.com>
---

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 16d71da8fbc3..0da51bffa8e5 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -213,8 +213,10 @@ int main(int argc, const char **argv)
     r = mds->init(shadow);
   else
     r = mds->init();
-  if (r < 0)
+  if (r < 0) {
+    msgr->wait();
     goto shutdown;
+  }
 
   // set up signal handlers, now that we've daemonized/forked.
   init_async_signal_handler();