From: John Spray <john.spray@redhat.com>
Date: Sun, 16 Jul 2017 13:50:40 +0000 (-0400)
Subject: osd: rephrase "wrongly marked me down" clog message
X-Git-Tag: v12.1.2~149^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a83774013c849cbfd6c9562fbb98a0005365c44f;p=ceph.git

osd: rephrase "wrongly marked me down" clog message

Rephrase as "Monitor daemon marked osd.<id> down, but it is
still running", which is more descriptive.  Demote the
epoch information to DEBUG level.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a5b7659af6f5..7ebfc931d1ca 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7794,9 +7794,11 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
 	if (service.is_preparing_to_stop() || service.is_stopping()) {
 	  service.got_stop_ack();
 	} else {
-	  clog->warn() << "map e" << osdmap->get_epoch()
-		       << " wrongly marked me down at e"
-		       << osdmap->get_down_at(whoami);
+          clog->warn() << "Monitor daemon marked osd." << whoami << " down, "
+                          "but it is still running";
+          clog->debug() << "map e" << osdmap->get_epoch()
+                        << " wrongly marked me down at e"
+                        << osdmap->get_down_at(whoami);
 	}
       } else if (!osdmap->get_addr(whoami).probably_equals(
 		   client_messenger->get_myaddr())) {