From: Sage Weil <sage@redhat.com>
Date: Fri, 17 Mar 2017 20:42:31 +0000 (-0400)
Subject: mgr: do not crash if FSMap doesn't have 'addr' metadata
X-Git-Tag: v12.0.2~252^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6fab0825f27c3cb0bb93a28abea9cd4d50c9150;p=ceph.git

mgr: do not crash if FSMap doesn't have 'addr' metadata

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 61b09fe191bb..f9a513154462 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -498,7 +498,8 @@ void Mgr::handle_fs_map(MFSMap* m)
       // FIXME: nothing stopping old daemons being here, they won't have
       // addr: need to handle case of pre-ceph-mgr daemons that don't have
       // the fields we expect
-      if (metadata->metadata.empty()) {
+      if (metadata->metadata.empty() ||
+	  metadata->metadata.count("addr") == 0) {
         update = true;
       } else {
         auto metadata_addr = metadata->metadata.at("addr");