mds: link_rollback more modernization for dencoder

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

diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h
index 8ad1a6023c601567a9b13a9d83a53e1b2b038f22..f05872535d1dc7b4a04e5268073bfd8f3b9968ce 100644 (file)
--- a/src/mds/events/ESlaveUpdate.h
+++ b/src/mds/events/ESlaveUpdate.h
@@ -31,26 +31,12 @@ struct link_rollback {
   utime_t old_dir_mtime;
   utime_t old_dir_rctime;
 
-  void encode(bufferlist &bl) const {
-    ENCODE_START(2, 2, bl);
-    ::encode(reqid, bl);
-    ::encode(ino, bl);
-    ::encode(was_inc, bl);
-    ::encode(old_ctime, bl);
-    ::encode(old_dir_mtime, bl);
-    ::encode(old_dir_rctime, bl);
-    ENCODE_FINISH(bl);
-  }
-  void decode(bufferlist::iterator &bl) {
-    DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
-    ::decode(reqid, bl);
-    ::decode(ino, bl);
-    ::decode(was_inc, bl);
-    ::decode(old_ctime, bl);
-    ::decode(old_dir_mtime, bl);
-    ::decode(old_dir_rctime, bl);
-    DECODE_FINISH(bl);
-  }
+  link_rollback() : ino(0), was_inc(false) {}
+
+  void encode(bufferlist& bl) const;
+  void decode(bufferlist::iterator& bl);
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<link_rollback*>& ls);
 };
 WRITE_CLASS_ENCODER(link_rollback)
 

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 1e1280585aef67bb667d01024cd96e39b39dd7ff..f15d5c857ec3dbbdb3345e3ebeeba44a114663fe 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1733,6 +1733,46 @@ void ECommitted::generate_test_instances(list<ECommitted*>& ls)
 // -----------------------
 // ESlaveUpdate
 
+void link_rollback::encode(bufferlist &bl) const
+{
+  ENCODE_START(2, 2, bl);
+  ::encode(reqid, bl);
+  ::encode(ino, bl);
+  ::encode(was_inc, bl);
+  ::encode(old_ctime, bl);
+  ::encode(old_dir_mtime, bl);
+  ::encode(old_dir_rctime, bl);
+  ENCODE_FINISH(bl);
+}
+
+void link_rollback::decode(bufferlist::iterator &bl)
+{
+  DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
+  ::decode(reqid, bl);
+  ::decode(ino, bl);
+  ::decode(was_inc, bl);
+  ::decode(old_ctime, bl);
+  ::decode(old_dir_mtime, bl);
+  ::decode(old_dir_rctime, bl);
+  DECODE_FINISH(bl);
+}
+
+void link_rollback::dump(Formatter *f) const
+{
+  f->dump_stream("metareqid") << reqid;
+  f->dump_int("ino", ino);
+  f->dump_string("was incremented", was_inc ? "true" : "false");
+  f->dump_stream("old_ctime") << old_ctime;
+  f->dump_stream("old_dir_mtime") << old_dir_mtime;
+  f->dump_stream("old_dir_rctime") << old_dir_rctime;
+}
+
+void link_rollback::generate_test_instances(list<link_rollback*>& ls)
+{
+  ls.push_back(new link_rollback());
+}
+
+
 void ESlaveUpdate::replay(MDS *mds)
 {
   MDSlaveUpdate *su;

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 2e4cd8210dbc4674ac17356e11bc961f91b3e81d..cb584f162c70d0bbfc581c25435b0ceeabdd152e 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -147,6 +147,9 @@ TYPE(EResetJournal)
 TYPE(ESession)
 #include "mds/events/ESessions.h"
 TYPE(ESessions)
+#include "mds/events/ESlaveUpdate.h"
+TYPE(link_rollback)
+
 
 #ifdef WITH_RADOSGW