From 82ef5fbdaf30d0b65435aec1a497f9e9b842e611 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 11 Mar 2025 15:03:59 -0400 Subject: [PATCH] include/cephfs: dump optmetadata For inspection from `dump tree` MDS command. Signed-off-by: Patrick Donnelly (cherry picked from commit 7ad1937547d0fe8c5302cd822d6cad57bdc6140f) --- src/include/cephfs/types.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/include/cephfs/types.h b/src/include/cephfs/types.h index 5185e81cebe5c..8bae4613133c0 100644 --- a/src/include/cephfs/types.h +++ b/src/include/cephfs/types.h @@ -490,7 +490,7 @@ public: os << "unknown_md_t(len=" << payload.size() << ")"; } void dump(ceph::Formatter* f) const { - f->dump_bool("length", payload.length()); + f->dump_bool("length", payload.size()); } private: @@ -568,7 +568,9 @@ struct optmetadata_singleton { } void dump(ceph::Formatter* f) const { f->dump_int("kind", u64kind); - f->dump_object("metadata", optmetadata); + f->open_object_section("metadata"); + std::visit([f](auto& o) { o.dump(f); }, optmetadata); + f->close_section(); } void encode(ceph::buffer::list& bl, uint64_t features) const { @@ -621,7 +623,7 @@ struct optmetadata_multiton { for (auto& opt : opts) { f->dump_object("opt", opt); } - f->dump_object("opts", opts); + f->close_section(); } bool has_opt(optkind_t kind) const { @@ -1211,6 +1213,8 @@ void inode_t::dump(ceph::Formatter *f) const quota.dump(f); f->close_section(); + f->dump_object("optmetadata", optmetadata); + f->dump_stream("last_scrub_stamp") << last_scrub_stamp; f->dump_unsigned("last_scrub_version", last_scrub_version); } -- 2.39.5