From: Sage Weil <sage@inktank.com>
Date: Tue, 28 May 2013 16:16:17 +0000 (-0700)
Subject: osd/OSDMap: fix Incremental dump
X-Git-Tag: v0.64~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b528a915f666796e4259feb929457cafb9f4ea33;p=ceph.git

osd/OSDMap: fix Incremental dump

The front hb addr entry may not be present.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 5fe0a8edc3f8..c0363a7562bd 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -473,7 +473,9 @@ void OSDMap::Incremental::dump(Formatter *f) const
     f->dump_stream("public_addr") << p->second;
     f->dump_stream("cluster_addr") << new_up_cluster.find(p->first)->second;
     f->dump_stream("heartbeat_back_addr") << new_hb_back_up.find(p->first)->second;
-    f->dump_stream("heartbeat_front_addr") << new_hb_front_up.find(p->first)->second;
+    map<int32_t, entity_addr_t>::const_iterator q;
+    if ((q = new_hb_front_up.find(p->first)) != new_hb_front_up.end())
+      f->dump_stream("heartbeat_front_addr") << q->second;
     f->close_section();
   }
   f->close_section();