Merge pull request #4103 from ceph/wip-error-str

mds: fix error_str formatting in scrub output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Gregory Farnum 2015-03-20 10:59:26 -07:00
commit 1e463ada30

View File

@ -3804,7 +3804,7 @@ void CInode::validated_data::dump(Formatter *f) const
f->dump_int("read_ret_val", backtrace.ondisk_read_retval); f->dump_int("read_ret_val", backtrace.ondisk_read_retval);
f->dump_stream("ondisk_value") << backtrace.ondisk_value; f->dump_stream("ondisk_value") << backtrace.ondisk_value;
f->dump_stream("memoryvalue") << backtrace.memory_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->close_section(); // backtrace
f->open_object_section("raw_rstats"); f->open_object_section("raw_rstats");
@ -3814,7 +3814,7 @@ void CInode::validated_data::dump(Formatter *f) const
f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval); f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval);
f->dump_stream("ondisk_value") << raw_rstats.ondisk_value; f->dump_stream("ondisk_value") << raw_rstats.ondisk_value;
f->dump_stream("memory_value") << raw_rstats.memory_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 f->close_section(); // raw_rstats
// dump failure return code // dump failure return code