update sources to v12.2.5

[ceph.git] / ceph / src / osd / ECUtil.cc

diff --git a/ceph/src/osd/ECUtil.cc b/ceph/src/osd/ECUtil.cc
index 9c3c7981ea32b6d9dc0e6884aa2666ec063de3ea..ae757db7543fa851339a13e15c76676b3d90a948 100644 (file)
--- a/ceph/src/osd/ECUtil.cc
+++ b/ceph/src/osd/ECUtil.cc
@@ -176,7 +176,7 @@ void ECUtil::HashInfo::decode(bufferlist::iterator &bl)
 void ECUtil::HashInfo::dump(Formatter *f) const
 {
   f->dump_unsigned("total_chunk_size", total_chunk_size);
-  f->open_object_section("cumulative_shard_hashes");
+  f->open_array_section("cumulative_shard_hashes");
   for (unsigned i = 0; i != cumulative_shard_hashes.size(); ++i) {
     f->open_object_section("hash");
     f->dump_unsigned("shard", i);
@@ -186,6 +186,16 @@ void ECUtil::HashInfo::dump(Formatter *f) const
   f->close_section();
 }
 
+namespace ECUtil {
+std::ostream& operator<<(std::ostream& out, const HashInfo& hi)
+{
+  ostringstream hashes;
+  for (auto hash: hi.cumulative_shard_hashes)
+    hashes << " " << hex << hash;
+  return out << "tcs=" << hi.total_chunk_size << hashes.str();
+}
+}
+
 void ECUtil::HashInfo::generate_test_instances(list<HashInfo*>& o)
 {
   o.push_back(new HashInfo(3));