mds: rmdir_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 f05872535d1dc7b4a04e5268073bfd8f3b9968ce..db5ccac537e3be97077e902176155a130235fca9 100644 (file)
--- a/src/mds/events/ESlaveUpdate.h
+++ b/src/mds/events/ESlaveUpdate.h
@@ -53,24 +53,10 @@ struct rmdir_rollback {
   dirfrag_t dest_dir;
   string dest_dname;
 
-  void encode(bufferlist& bl) const {
-    ENCODE_START(2, 2, bl);
-    ::encode(reqid, bl);
-    ::encode(src_dir, bl);
-    ::encode(src_dname, bl);
-    ::encode(dest_dir, bl);
-    ::encode(dest_dname, bl);
-    ENCODE_FINISH(bl);
-  }
-  void decode(bufferlist::iterator& bl) {
-    DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
-    ::decode(reqid, bl);
-    ::decode(src_dir, bl);
-    ::decode(src_dname, bl);
-    ::decode(dest_dir, bl);
-    ::decode(dest_dname, bl);
-    DECODE_FINISH(bl);
-  }
+  void encode(bufferlist& bl) const;
+  void decode(bufferlist::iterator& bl);
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<rmdir_rollback*>& ls);
 };
 WRITE_CLASS_ENCODER(rmdir_rollback)
 

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index f15d5c857ec3dbbdb3345e3ebeeba44a114663fe..bbbc3014611ed51ccf91b7dd9d597a4e6bb84852 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1772,6 +1772,42 @@ void link_rollback::generate_test_instances(list<link_rollback*>& ls)
   ls.push_back(new link_rollback());
 }
 
+void rmdir_rollback::encode(bufferlist& bl) const
+{
+  ENCODE_START(2, 2, bl);
+  ::encode(reqid, bl);
+  ::encode(src_dir, bl);
+  ::encode(src_dname, bl);
+  ::encode(dest_dir, bl);
+  ::encode(dest_dname, bl);
+  ENCODE_FINISH(bl);
+}
+
+void rmdir_rollback::decode(bufferlist::iterator& bl)
+{
+  DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
+  ::decode(reqid, bl);
+  ::decode(src_dir, bl);
+  ::decode(src_dname, bl);
+  ::decode(dest_dir, bl);
+  ::decode(dest_dname, bl);
+  DECODE_FINISH(bl);
+}
+
+void rmdir_rollback::dump(Formatter *f) const
+{
+  f->dump_stream("metareqid") << reqid;
+  f->dump_stream("source directory") << src_dir;
+  f->dump_string("source dname", src_dname);
+  f->dump_stream("destination directory") << dest_dir;
+  f->dump_string("destination dname", dest_dname);
+}
+
+void rmdir_rollback::generate_test_instances(list<rmdir_rollback*>& ls)
+{
+  ls.push_back(new rmdir_rollback());
+}
+
 
 void ESlaveUpdate::replay(MDS *mds)
 {

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index cb584f162c70d0bbfc581c25435b0ceeabdd152e..00a9d090e7305e26ee01c71f6bba41c3caa47a1f 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -149,7 +149,7 @@ TYPE(ESession)
 TYPE(ESessions)
 #include "mds/events/ESlaveUpdate.h"
 TYPE(link_rollback)
-
+TYPE(rmdir_rollback)
 
 #ifdef WITH_RADOSGW