OSD: print log when osd want to kill self

Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 9bc7d9667076473deda4a9214eb74955458eb36f)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ee912c683f295c30f66cd25fb3fea2d6d3d94062..72b36c0dcf7527109dde399dec0523e404ac2a3b 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7063,12 +7063,12 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
               osd_markdown_log.front() + grace < now)
          osd_markdown_log.pop_front();
        if ((int)osd_markdown_log.size() > g_conf->osd_max_markdown_count) {
-         dout(10) << __func__ << " marked down "
-                  << osd_markdown_log.size()
-                  << " > osd_max_markdown_count "
-                  << g_conf->osd_max_markdown_count
-                  << " in last " << grace << " seconds, shutting down"
-                  << dendl;
+         dout(0) << __func__ << " marked down "
+                 << osd_markdown_log.size()
+                 << " > osd_max_markdown_count "
+                 << g_conf->osd_max_markdown_count
+                 << " in last " << grace << " seconds, shutting down"
+                 << dendl;
          do_restart = false;
          do_shutdown = true;
        }
@@ -7084,18 +7084,21 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
        if (r != 0) {
          do_shutdown = true;  // FIXME: do_restart?
           network_error = true;
+          dout(0) << __func__ << " marked down: rebind failed" << dendl;
         }
 
        r = hb_back_server_messenger->rebind(avoid_ports);
        if (r != 0) {
          do_shutdown = true;  // FIXME: do_restart?
           network_error = true;
+          dout(0) << __func__ << " marked down: rebind failed" << dendl;
         }
 
        r = hb_front_server_messenger->rebind(avoid_ports);
        if (r != 0) {
          do_shutdown = true;  // FIXME: do_restart?
           network_error = true;
+          dout(0) << __func__ << " marked down: rebind failed" << dendl;
         }
 
        hbclient_messenger->mark_down_all();