From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Fri, 27 Sep 2019 07:39:15 +0000 (+0800)
Subject: ceph-dencoder: add RGWPeriodLatestEpochInfo support.
X-Git-Tag: v15.1.0~1356^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30613%2Fhead;p=ceph.git

ceph-dencoder: add RGWPeriodLatestEpochInfo support.

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc
index 64ad1c21ffe8..612d6d1e8b70 100644
--- a/src/rgw/rgw_dencoder.cc
+++ b/src/rgw/rgw_dencoder.cc
@@ -477,6 +477,13 @@ void RGWPeriod::generate_test_instances(list<RGWPeriod*> &o)
   o.push_back(new RGWPeriod);
 }
 
+void RGWPeriodLatestEpochInfo::generate_test_instances(list<RGWPeriodLatestEpochInfo*> &o)
+{
+  RGWPeriodLatestEpochInfo *z = new RGWPeriodLatestEpochInfo;
+  o.push_back(z);
+  o.push_back(new RGWPeriodLatestEpochInfo);
+}
+
 void RGWZoneParams::generate_test_instances(list<RGWZoneParams*> &o)
 {
   o.push_back(new RGWZoneParams);
diff --git a/src/rgw/rgw_zone.h b/src/rgw/rgw_zone.h
index 64ceb87965b2..9ce902040b3b 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<RGWPeriodLatestEpochInfo*>& o);
 };
 WRITE_CLASS_ENCODER(RGWPeriodLatestEpochInfo)
 
diff --git a/src/tools/ceph-dencoder/rgw_types.h b/src/tools/ceph-dencoder/rgw_types.h
index 2116eb0b1c61..bd1443ddf133 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)