mds: mds_table_pending_t now uses modern encoding

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index 6f6f9aa19c43cfeb9683c0d6c52b081f2f719e46..eb2249885368391bc1e9caab6ae48dcd32fa8898 100644 (file)
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -660,3 +660,41 @@ void MDSCacheObjectInfo::generate_test_instances(list<MDSCacheObjectInfo*>& ls)
   ls.back()->dname = "bar foo";
   ls.back()->snapid = 21322;
 }
+
+
+/*
+ * mds_table_pending_t
+ */
+void mds_table_pending_t::encode(bufferlist& bl) const
+{
+  ENCODE_START(2, 2, bl);
+  ::encode(reqid, bl);
+  ::encode(mds, bl);
+  ::encode(tid, bl);
+  ENCODE_FINISH(bl);
+}
+
+void mds_table_pending_t::decode(bufferlist::iterator& bl)
+{
+  DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
+  ::decode(reqid, bl);
+  ::decode(mds, bl);
+  ::decode(tid, bl);
+  DECODE_FINISH(bl);
+}
+
+void mds_table_pending_t::dump(Formatter *f) const
+{
+  f->dump_unsigned("reqid", reqid);
+  f->dump_unsigned("mds", mds);
+  f->dump_unsigned("tid", tid);
+}
+
+void mds_table_pending_t::generate_test_instances(list<mds_table_pending_t*>& ls)
+{
+  ls.push_back(new mds_table_pending_t);
+  ls.push_back(new mds_table_pending_t);
+  ls.back()->reqid = 234;
+  ls.back()->mds = 2;
+  ls.back()->tid = 35434;
+}

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 32439ffaffd111bd6c9abe6a381929dee361131e..d201a8986903daefcd2f336208ba096113b16073 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -625,20 +625,11 @@ struct mds_table_pending_t {
   uint64_t reqid;
   __s32 mds;
   version_t tid;
-  void encode(bufferlist& bl) const {
-    __u8 struct_v = 1;
-    ::encode(struct_v, bl);
-    ::encode(reqid, bl);
-    ::encode(mds, bl);
-    ::encode(tid, bl);
-  }
-  void decode(bufferlist::iterator& bl) {
-    __u8 struct_v;
-    ::decode(struct_v, bl);
-    ::decode(reqid, bl);
-    ::decode(mds, bl);
-    ::decode(tid, bl);
-  }
+  mds_table_pending_t() : reqid(0), mds(0), tid(0) {}
+  void encode(bufferlist& bl) const;
+  void decode(bufferlist::iterator& bl);
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<mds_table_pending_t*>& ls);
 };
 WRITE_CLASS_ENCODER(mds_table_pending_t)
 

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index b7e798aef34ea348e5544f49db9e7a6e01f84945..a2fa626e7c35112cff3595ff269702889dcaf7c6 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -107,6 +107,7 @@ TYPE(fnode_t)
 TYPE(session_info_t)
 TYPE(string_snap_t)
 TYPE(MDSCacheObjectInfo)
+TYPE(mds_table_pending_t)
 
 #ifdef WITH_RADOSGW