]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/Mgr: print bad (non-object) json
authorSage Weil <sage@redhat.com>
Wed, 30 Jan 2019 22:17:25 +0000 (16:17 -0600)
committerSage Weil <sage@redhat.com>
Wed, 13 Feb 2019 17:41:21 +0000 (11:41 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/Mgr.cc

index 24188518bfa34e1807a4aa92f01ac23cb37ae866..7cd6c91eb655d6e94ef6893ae112bcd6c3644886 100644 (file)
@@ -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;