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: v13.2.5~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e458cd69759581b0cf8f388dbd06d14bc2ec6a4b;p=ceph.git

mgr: Apply sanity check for daemon metadata

Signed-off-by: Xinying Song <songxinying@sensetime.com>
(cherry picked from commit 3c333f3599642f29dc7a080570ed6b1954e49dce)
---

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 17389d3de5e1..05d1b004c9f6 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -87,6 +87,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()) {