]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix error_str formatting in scrub output 4103/head
authorJohn Spray <jspray@redhat.com>
Thu, 19 Mar 2015 13:15:24 +0000 (13:15 +0000)
committerJohn Spray <jspray@redhat.com>
Thu, 19 Mar 2015 13:16:33 +0000 (13:16 +0000)
operator<< on an ostringstream actually gets
you an address.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/CInode.cc

index 8309c88e078bc23f5c91539763d2d91eb1d2b6ed..017cd4efacdbca4f31d403e88a7fd4f796db34da 100644 (file)
@@ -3807,7 +3807,7 @@ void CInode::validated_data::dump(Formatter *f) const
       f->dump_int("read_ret_val", backtrace.ondisk_read_retval);
       f->dump_stream("ondisk_value") << backtrace.ondisk_value;
       f->dump_stream("memoryvalue") << backtrace.memory_value;
-      f->dump_stream("error_str") << backtrace.error_str;
+      f->dump_string("error_str", backtrace.error_str.str());
     }
     f->close_section(); // backtrace
     f->open_object_section("raw_rstats");
@@ -3817,7 +3817,7 @@ void CInode::validated_data::dump(Formatter *f) const
       f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval);
       f->dump_stream("ondisk_value") << raw_rstats.ondisk_value;
       f->dump_stream("memory_value") << raw_rstats.memory_value;
-      f->dump_stream("error_str") << raw_rstats.error_str;
+      f->dump_string("error_str", raw_rstats.error_str.str());
     }
     f->close_section(); // raw_rstats
     // dump failure return code