mds: do not dump empty bufptr

batrick · batrick · commit 706eb26f560b · 2024-09-27T14:58:19.000-04:00
Fixes: https://tracker.ceph.com/issues/68243 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
@@ -4589,8 +4589,11 @@ void InodeStoreBase::dump(Formatter *f) const
     for (const auto& [key, val] : *xattrs) {
       f->open_object_section("xattr");
       f->dump_string("key", key);
-      std::string v(val.c_str(), val.length());
-      f->dump_string("val", v);
+      if (val.length()) {
+        f->dump_string("val", std::string(val.c_str(), val.length()));
+      } else {
+        f->dump_string("val", "");
+      }
       f->close_section();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -4589,8 +4589,11 @@ void InodeStoreBase::dump(Formatter *f) const`
`4589`	`4589`	`for (const auto& [key, val] : *xattrs) {`
`4590`	`4590`	`f->open_object_section("xattr");`
`4591`	`4591`	`f->dump_string("key", key);`
`4592`		`- std::string v(val.c_str(), val.length());`
`4593`		`- f->dump_string("val", v);`
	`4592`	`+ if (val.length()) {`
	`4593`	`+ f->dump_string("val", std::string(val.c_str(), val.length()));`
	`4594`	`+ } else {`
	`4595`	`+ f->dump_string("val", "");`
	`4596`	`+ }`
`4594`	`4597`	`f->close_section();`
`4595`	`4598`	`}`
`4596`	`4599`	`}`