From: Sage Weil <sage@inktank.com>
Date: Tue, 16 Jul 2013 21:21:08 +0000 (-0700)
Subject: osd: make 'from dead osd' message more informative
X-Git-Tag: v0.67-rc1~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F441%2Fhead;p=ceph.git

osd: make 'from dead osd' message more informative

I thought I saw some weirdness here.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 109683ff0518..5b8ef307dd1b 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5568,7 +5568,10 @@ bool OSD::require_same_or_newer_map(OpRequestRef op, epoch_t epoch)
     int from = m->get_source().num();
     if (!osdmap->have_inst(from) ||
 	osdmap->get_cluster_addr(from) != m->get_source_inst().addr) {
-      dout(10) << "from dead osd." << from << ", marking down" << dendl;
+      dout(5) << "from dead osd." << from << ", marking down, "
+	      << " msg was " << m->get_source_inst().addr
+	      << " expected " << (osdmap->have_inst(from) ? osdmap->get_cluster_addr(from) : entity_addr_t())
+	      << dendl;
       cluster_messenger->mark_down(m->get_connection());
       return false;
     }