From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Oct 2016 18:02:47 +0000 (-0400)
Subject: mds: fix EMetaBlob::fullbit xattr dump
X-Git-Tag: v11.1.0~605^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11536%2Fhead;p=ceph.git

mds: fix EMetaBlob::fullbit xattr dump

- show xattr names!
- bound the values

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

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 70a843be1df2..1105cb1c744e 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -495,10 +495,11 @@ void EMetaBlob::fullbit::dump(Formatter *f) const
   f->open_object_section("inode");
   inode.dump(f);
   f->close_section(); // inode
-  f->open_array_section("xattrs");
+  f->open_object_section("xattrs");
   for (map<string, bufferptr>::const_iterator iter = xattrs.begin();
       iter != xattrs.end(); ++iter) {
-    f->dump_string(iter->first.c_str(), iter->second.c_str());
+    string s(iter->second.c_str(), iter->second.length());
+    f->dump_string(iter->first.c_str(), s);
   }
   f->close_section(); // xattrs
   if (inode.is_symlink()) {