From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Jan 2019 22:17:25 +0000 (-0600)
Subject: mgr/Mgr: print bad (non-object) json
X-Git-Tag: v14.1.0~129^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=92b2fe9e653f69ea855fa759a091ed75033bd7e0;p=ceph-ci.git

mgr/Mgr: print bad (non-object) json

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 24188518bfa..7cd6c91eb65 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -80,6 +80,12 @@ void MetadataUpdate::finish(int r)
                 << key.first << "." << key.second << dendl;
         return;
       }
+      if (json_result.type() != json_spirit::obj_type) {
+        dout(1) << "mon returned valid JSON "
+                << key.first << "." << key.second
+		<< " but not an object: '" << outbl.to_str() << "'" << dendl;
+        return;
+      }
       dout(4) << "mon returned valid metadata JSON for "
               << key.first << "." << key.second << dendl;