Merge pull request #6996 from H3C/wip-mds-f11322

mds: we should wait messenger when MDSDaemon suicide Reviewed-by: John Spray <john.spray@redhat.com>
ceph · Dec 23, 2015 · 0c17b61 · 0c17b61
2 parents e0833f2 + fff4941
commit 0c17b61
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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();