From 361838d7efde7a68e0366dd4950012ece7e097fb Mon Sep 17 00:00:00 2001 From: wangsongbo Date: Thu, 14 Dec 2017 15:16:35 +0800 Subject: [PATCH] ceph-dencoder: add missing begin_iter & end_iter item for RGWObjManifest Signed-off-by: Songbo Wang wangsongbo@cloudin.cn --- src/rgw/rgw_json_enc.cc | 23 +++++++++++++++++++++++ src/rgw/rgw_rados.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc index 48690abc9da1..3b6c648764d3 100644 --- a/src/rgw/rgw_json_enc.cc +++ b/src/rgw/rgw_json_enc.cc @@ -88,6 +88,26 @@ void rgw_bucket_placement::dump(Formatter *f) const encode_json("placement_rule", placement_rule, f); } +void rgw_obj_select::dump(Formatter *f) const +{ + f->dump_string("placement_rule", placement_rule); + f->dump_object("obj", obj); + f->dump_object("raw_obj", raw_obj); + f->dump_bool("is_raw", is_raw); +} + +void RGWObjManifest::obj_iterator::dump(Formatter *f) const +{ + f->dump_unsigned("part_ofs", part_ofs); + f->dump_unsigned("stripe_ofs", stripe_ofs); + f->dump_unsigned("ofs", ofs); + f->dump_unsigned("stripe_size", stripe_size); + f->dump_int("cur_part_id", cur_part_id); + f->dump_int("cur_stripe", cur_stripe); + f->dump_string("cur_override_prefix", cur_override_prefix); + f->dump_object("location", location); +} + void RGWObjManifest::dump(Formatter *f) const { map::const_iterator iter = objs.begin(); @@ -107,6 +127,9 @@ void RGWObjManifest::dump(Formatter *f) const ::encode_json("rules", rules, f); ::encode_json("tail_instance", tail_instance, f); ::encode_json("tail_placement", tail_placement, f); + + f->dump_object("begin_iter", begin_iter); + f->dump_object("end_iter", end_iter); } void rgw_log_entry::dump(Formatter *f) const diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 97a62c65dd30..543d604f9cf2 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -174,6 +174,7 @@ public: void set_placement_rule(const string& rule) { placement_rule = rule; } + void dump(Formatter *f) const; }; struct compression_block { @@ -789,6 +790,7 @@ public: void update_location(); friend class RGWObjManifest; + void dump(Formatter *f) const; }; const obj_iterator& obj_begin(); -- 2.47.3