From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 21 Jul 2018 03:18:11 +0000 (-0700)
Subject: Merge PR #23062 into master
X-Git-Tag: v14.0.1~815
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0a4959318e8ca7b6e4a62006dd10c5503a8df50e;p=ceph-ci.git

Merge PR #23062 into master

* refs/pull/23062/head:
	mds: dump recent events on respawn

Reviewed-by: Sage Weil <sage@redhat.com>
---

0a4959318e8ca7b6e4a62006dd10c5503a8df50e
diff --cc src/mds/MDSDaemon.cc
index 7bf62ca0366,8cbcf9fac3d..49281a5ce90
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@@ -1081,8 -1080,12 +1081,12 @@@ void MDSDaemon::suicide(
  
  void MDSDaemon::respawn()
  {
 -  dout(1) << "respawn" << dendl;
 +  dout(1) << "respawn!" << dendl;
  
+   /* Dump recent in case the MDS was stuck doing something which caused it to
+    * be removed from the MDSMap leading to respawn. */
+   g_ceph_context->_log->dump_recent();
+ 
    char *new_argv[orig_argc+1];
    dout(1) << " e: '" << orig_argv[0] << "'" << dendl;
    for (int i=0; i<orig_argc; i++) {