From 7ece2787bf3cf5226664eaed80b332087e63b996 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Jan 2012 09:41:15 -0800 Subject: [PATCH] osd: dump and generators for OSDSuperblock Signed-off-by: Sage Weil --- src/osd/osd_types.cc | 30 ++++++++++++++++++++++++++++++ src/osd/osd_types.h | 2 ++ src/test/encoding/types.h | 1 + 3 files changed, 33 insertions(+) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 635d2f0bc4b00..edb5cf794404c 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -583,6 +583,36 @@ void OSDSuperblock::decode(bufferlist::iterator &bl) ::decode(osd_fsid, bl); } +void OSDSuperblock::dump(Formatter *f) const +{ + f->dump_stream("cluster_fsid") << cluster_fsid; + f->dump_stream("osd_fsid") << osd_fsid; + f->dump_int("whoami", whoami); + f->dump_int("current_epoch", current_epoch); + f->dump_int("oldest_map", oldest_map); + f->dump_int("newest_map", newest_map); + f->dump_float("weight", weight); + f->open_object_section("compat"); + compat_features.dump(f); + f->close_section(); + f->dump_int("clean_thru", clean_thru); + f->dump_int("last_epoch_mounted", mounted); +} + +void OSDSuperblock::generate_test_instances(list& o) +{ + OSDSuperblock z; + o.push_back(z); + memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid)); + memset(&z.osd_fsid, 2, sizeof(z.osd_fsid)); + z.whoami = 3; + z.current_epoch = 4; + z.oldest_map = 5; + z.newest_map = 9; + z.mounted = 8; + z.clean_thru = 7; + o.push_back(z); +} // -- SnapSet -- diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index ff4ff9391ee13..c7e23dfa98dd8 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1139,6 +1139,8 @@ public: void encode(bufferlist &bl) const; void decode(bufferlist::iterator &bl); + void dump(Formatter *f) const; + static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(OSDSuperblock) diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h index 9defc632c18e2..dc029ca4522f8 100644 --- a/src/test/encoding/types.h +++ b/src/test/encoding/types.h @@ -5,6 +5,7 @@ #include "osd/osd_types.h" TYPE(osd_stat_t) +TYPE(OSDSuperblock) /*TYPE(pool_snap_info_t) TYPE(pg_pool_t) TYPE(object_stat_sum_t) -- 2.39.5