From: Sage Weil <sage@redhat.com>
Date: Tue, 23 May 2017 02:58:44 +0000 (-0400)
Subject: mon/OSDMonitor: clean up no-beacon message
X-Git-Tag: ses5-milestone6~8^2~19^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50c617a4479cdd07f3624c845ff7e24676f041e1;p=ceph.git

mon/OSDMonitor: clean up no-beacon message

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3a6d6ab31fe..5de9a07d3c0 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3527,11 +3527,10 @@ bool OSDMonitor::handle_osd_timeouts(const utime_t &now,
     } else if (can_mark_down(i)) {
       utime_t diff = now - t->second;
       if (diff > timeo) {
-	mon->clog->info() << "osd." << i << " failed ("
-			  << osdmap.crush->get_full_location_ordered_string(i)
-			  << ") (pg stats for " << diff << "seconds)";
-	derr << "no osd or pg stats from osd." << i << " since " << t->second << ", " << diff
-	     << " seconds ago.  marking down" << dendl;
+	mon->clog->info() << "osd." << i << " marked down after no beacon for "
+			  << diff << " seconds";
+	derr << "no beacon from osd." << i << " since " << t->second
+	     << ", " << diff << " seconds ago.  marking down" << dendl;
 	pending_inc.new_state[i] = CEPH_OSD_UP;
 	new_down = true;
       }