osd: formatter for ObjectRecoveryInfo

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 14694de195b62da27b80b0e67367915c0454ec58..5a1c551d8e16298cb5a8f273cf4f5dc02fb458ff 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -6659,19 +6659,15 @@ void ObjectRecoveryInfo::dump(Formatter *f) const
 
 ostream& operator<<(ostream& out, const ObjectRecoveryInfo &inf)
 {
-  return inf.print(out);
+  return out << inf.fmt_print();
 }
 
-ostream &ObjectRecoveryInfo::print(ostream &out) const
+std::string ObjectRecoveryInfo::fmt_print() const
 {
-  return out << "ObjectRecoveryInfo("
-            << soid << "@" << version
-            << ", size: " << size
-            << ", copy_subset: " << copy_subset
-            << ", clone_subset: " << clone_subset
-            << ", snapset: " << ss
-            << ", object_exist: " << object_exist
-            << ")";
+  return fmt::format(
+      "ObjectRecoveryInfo({}@{}, size: {}, copy_subset: {}, "
+      "clone_subset: {}, snapset: {}, object_exist: {})",
+      soid, version, size, copy_subset, clone_subset, ss, object_exist);
 }
 
 // -- PushReplyOp --

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 64c337a5b24345293d4782fdac31babdedb16a94..7c7884404c01abf588413b71b638341653fc8dd8 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -6005,7 +6005,7 @@ struct ObjectRecoveryInfo {
   static void generate_test_instances(std::list<ObjectRecoveryInfo*>& o);
   void encode(ceph::buffer::list &bl, uint64_t features) const;
   void decode(ceph::buffer::list::const_iterator &bl, int64_t pool = -1);
-  std::ostream &print(std::ostream &out) const;
+  std::string fmt_print() const;
   void dump(ceph::Formatter *f) const;
 };
 WRITE_CLASS_ENCODER_FEATURES(ObjectRecoveryInfo)

diff --git a/src/osd/osd_types_fmt.h b/src/osd/osd_types_fmt.h
index 65a751469f7a5559ca6d0f5fccee62df2866813c..f6b38b02939790996ea3a4e854cbf703672e0712 100644 (file)
--- a/src/osd/osd_types_fmt.h
+++ b/src/osd/osd_types_fmt.h
@@ -329,7 +329,6 @@ struct fmt::formatter<ScrubMap> {
 };
 
 #if FMT_VERSION >= 90000
-template <> struct fmt::formatter<ObjectRecoveryInfo> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<ObjectRecoveryProgress> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<PastIntervals> : fmt::ostream_formatter {};
 template <> struct fmt::formatter<pg_log_op_return_item_t> : fmt::ostream_formatter {};