From: John Spray <john.spray@redhat.com>
Date: Wed, 29 Apr 2015 20:50:27 +0000 (+0100)
Subject: mds: in damaged() call flush_log before ending
X-Git-Tag: v9.0.1~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4519%2Fhead;p=ceph.git

mds: in damaged() call flush_log before ending

...so that the clog messages we send before damaged()
actually have a chance to make it to the cluster log.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 74a40821be7e..74c3a8778465 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -2372,6 +2372,7 @@ void MDS::handle_signal(int signum)
 void MDS::damaged()
 {
   set_want_state(MDSMap::STATE_DAMAGED);
+  monc->flush_log();  // Flush any clog error from before we were called
   beacon.notify_health(this);  // Include latest status in our swan song
   beacon.send_and_wait(g_conf->mds_mon_shutdown_timeout);