From: Xinying Song <songxinying@sensetime.com>
Date: Tue, 15 Jan 2019 11:18:20 +0000 (+0800)
Subject: mgr: Apply sanity check for daemon metadata
X-Git-Tag: v14.1.0~274^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c333f3599642f29dc7a080570ed6b1954e49dce;p=ceph.git

mgr: Apply sanity check for daemon metadata

Signed-off-by: Xinying Song <songxinying@sensetime.com>
---

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index e4c83c4e1526..24188518bfa3 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -85,6 +85,13 @@ void MetadataUpdate::finish(int r)
 
       json_spirit::mObject daemon_meta = json_result.get_obj();
 
+      // Skip daemon who doesn't have hostname yet
+      if (daemon_meta.count("hostname") == 0) {
+        dout(1) << "Skipping incomplete metadata entry for "
+                << key.first << "." << key.second << dendl;
+        return;
+      }
+
       // Apply any defaults
       for (const auto &i : defaults) {
         if (daemon_meta.find(i.first) == daemon_meta.end()) {