From 53b311e408e74906362fadefd50f91e2058282cf Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Fri, 28 Jan 2022 14:47:34 -0500 Subject: [PATCH] rgwlc: add cls_rgw_lc_get_entry_ret to rgw_types.h (dencoder) Signed-off-by: Matt Benjamin (cherry picked from commit c8291d9662a8dcaccdad0c1c93265c4b89d49c8a) --- src/cls/rgw/cls_rgw_ops.cc | 13 ++++++++++++- src/cls/rgw/cls_rgw_ops.h | 2 ++ src/cls/rgw/cls_rgw_types.cc | 13 ++++++++++++- src/cls/rgw/cls_rgw_types.h | 3 +++ src/tools/ceph-dencoder/rgw_types.h | 1 + 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/cls/rgw/cls_rgw_ops.cc b/src/cls/rgw/cls_rgw_ops.cc index 0aec63fabbafd..15bcba33330da 100644 --- a/src/cls/rgw/cls_rgw_ops.cc +++ b/src/cls/rgw/cls_rgw_ops.cc @@ -83,7 +83,6 @@ void cls_rgw_gc_list_ret::generate_test_instances(list& ls ls.back()->truncated = true; } - void cls_rgw_gc_remove_op::dump(Formatter *f) const { encode_json("tags", tags, f); @@ -97,6 +96,18 @@ void cls_rgw_gc_remove_op::generate_test_instances(list& ls.back()->tags.push_back("tag2"); } +void cls_rgw_lc_get_entry_ret::dump(Formatter *f) const +{ + encode_json("entry", entry, f); +} + +void cls_rgw_lc_get_entry_ret::generate_test_instances(list& ls) +{ + cls_rgw_lc_entry entry("bucket1", 6000, 0); + ls.push_back(new cls_rgw_lc_get_entry_ret); + ls.back()->entry = entry; +} + void rgw_cls_obj_prepare_op::generate_test_instances(list& o) { rgw_cls_obj_prepare_op *op = new rgw_cls_obj_prepare_op; diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h index f8c485c6e9e7e..2891a3b61049b 100644 --- a/src/cls/rgw/cls_rgw_ops.h +++ b/src/cls/rgw/cls_rgw_ops.h @@ -1124,6 +1124,8 @@ struct cls_rgw_lc_get_entry_ret { } DECODE_FINISH(bl); } + void dump(ceph::Formatter *f) const; + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(cls_rgw_lc_get_entry_ret) diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc index a2610c7fbd31c..ea2370f1d9dca 100644 --- a/src/cls/rgw/cls_rgw_types.cc +++ b/src/cls/rgw/cls_rgw_types.cc @@ -744,7 +744,18 @@ void cls_rgw_bucket_instance_entry::generate_test_instances( ls.back()->reshard_status = RESHARD_STATUS::IN_PROGRESS; ls.back()->new_bucket_instance_id = "new_instance_id"; } - + +void cls_rgw_lc_entry::dump(Formatter *f) const +{ + encode_json("bucket", bucket, f); + encode_json("start_time", start_time, f); + encode_json("status", status, f); +} + +void generate_test_instances(list& ls) +{ +} + void cls_rgw_lc_obj_head::dump(Formatter *f) const { encode_json("start_date", start_date, f); diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h index 885ba87b4b9cb..0d80dab2e21f4 100644 --- a/src/cls/rgw/cls_rgw_types.h +++ b/src/cls/rgw/cls_rgw_types.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include "common/ceph_time.h" #include "common/Formatter.h" @@ -1259,6 +1260,8 @@ struct cls_rgw_lc_entry { decode(status, bl); DECODE_FINISH(bl); } + void dump(Formatter *f) const; + void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(cls_rgw_lc_entry); diff --git a/src/tools/ceph-dencoder/rgw_types.h b/src/tools/ceph-dencoder/rgw_types.h index 8862774e7dd17..03d53d6765a65 100644 --- a/src/tools/ceph-dencoder/rgw_types.h +++ b/src/tools/ceph-dencoder/rgw_types.h @@ -44,6 +44,7 @@ TYPE(rgw_bucket_olh_log_entry) TYPE(rgw_usage_log_entry) #include "cls/rgw/cls_rgw_ops.h" +TYPE(cls_rgw_lc_get_entry_ret) TYPE(rgw_cls_obj_prepare_op) TYPE(rgw_cls_obj_complete_op) TYPE(rgw_cls_list_op) -- 2.39.5