From 701ee00800f4e4629cb7bd303cd4a6b481940e08 Mon Sep 17 00:00:00 2001 From: yuliyang Date: Fri, 27 Sep 2019 15:39:15 +0800 Subject: [PATCH] ceph-dencoder: add RGWPeriodLatestEpochInfo support. Signed-off-by: yuliyang --- src/rgw/rgw_dencoder.cc | 7 +++++++ src/rgw/rgw_zone.h | 3 ++- src/tools/ceph-dencoder/rgw_types.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc index 64ad1c21ffe82..612d6d1e8b701 100644 --- a/src/rgw/rgw_dencoder.cc +++ b/src/rgw/rgw_dencoder.cc @@ -477,6 +477,13 @@ void RGWPeriod::generate_test_instances(list &o) o.push_back(new RGWPeriod); } +void RGWPeriodLatestEpochInfo::generate_test_instances(list &o) +{ + RGWPeriodLatestEpochInfo *z = new RGWPeriodLatestEpochInfo; + o.push_back(z); + o.push_back(new RGWPeriodLatestEpochInfo); +} + void RGWZoneParams::generate_test_instances(list &o) { o.push_back(new RGWZoneParams); diff --git a/src/rgw/rgw_zone.h b/src/rgw/rgw_zone.h index 64ceb87965b2f..9ce902040b3bd 100644 --- a/src/rgw/rgw_zone.h +++ b/src/rgw/rgw_zone.h @@ -958,7 +958,7 @@ public: WRITE_CLASS_ENCODER(RGWRealm) struct RGWPeriodLatestEpochInfo { - epoch_t epoch; + epoch_t epoch = 0; void encode(bufferlist& bl) const { ENCODE_START(1, 1, bl); @@ -974,6 +974,7 @@ struct RGWPeriodLatestEpochInfo { void dump(Formatter *f) const; void decode_json(JSONObj *obj); + static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(RGWPeriodLatestEpochInfo) diff --git a/src/tools/ceph-dencoder/rgw_types.h b/src/tools/ceph-dencoder/rgw_types.h index 2116eb0b1c61b..bd1443ddf1335 100644 --- a/src/tools/ceph-dencoder/rgw_types.h +++ b/src/tools/ceph-dencoder/rgw_types.h @@ -12,6 +12,7 @@ TYPE(RGWZone) TYPE(RGWZoneGroup) TYPE(RGWRealm) TYPE(RGWPeriod) +TYPE(RGWPeriodLatestEpochInfo) #include "rgw/rgw_acl.h" TYPE(ACLPermission) -- 2.39.5