MDS: EMetaBlob more modernization for encoder

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

diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index 3cf77d091eba037b9414cdd8d506c3ebc03102cb..d1baefe940233a29f6c6c96efd5b3111935355a3 100644 (file)
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -324,70 +324,10 @@ private:
   list<pair<metareqid_t,uint64_t> > client_reqs;
 
  public:
-  void encode(bufferlist& bl) const {
-    ENCODE_START(5, 5, bl);
-    ::encode(lump_order, bl);
-    ::encode(lump_map, bl);
-    ::encode(roots, bl);
-    ::encode(table_tids, bl);
-    ::encode(opened_ino, bl);
-    ::encode(allocated_ino, bl);
-    ::encode(used_preallocated_ino, bl);
-    ::encode(preallocated_inos, bl);
-    ::encode(client_name, bl);
-    ::encode(inotablev, bl);
-    ::encode(sessionmapv, bl);
-    ::encode(truncate_start, bl);
-    ::encode(truncate_finish, bl);
-    ::encode(destroyed_inodes, bl);
-    ::encode(client_reqs, bl);
-    ::encode(renamed_dirino, bl);
-    ::encode(renamed_dir_frags, bl);
-    ENCODE_FINISH(bl);
-  }
-  void decode(bufferlist::iterator &bl) {
-    DECODE_START_LEGACY_COMPAT_LEN(5, 5, 5, bl);
-    ::decode(lump_order, bl);
-    ::decode(lump_map, bl);
-    if (struct_v >= 4) {
-      ::decode(roots, bl);
-    } else {
-      bufferlist rootbl;
-      ::decode(rootbl, bl);
-      if (rootbl.length()) {
-       bufferlist::iterator p = rootbl.begin();
-       roots.push_back(std::tr1::shared_ptr<fullbit>(new fullbit(p)));
-      }
-    }
-    ::decode(table_tids, bl);
-    ::decode(opened_ino, bl);
-    ::decode(allocated_ino, bl);
-    ::decode(used_preallocated_ino, bl);
-    ::decode(preallocated_inos, bl);
-    ::decode(client_name, bl);
-    ::decode(inotablev, bl);
-    ::decode(sessionmapv, bl);
-    ::decode(truncate_start, bl);
-    ::decode(truncate_finish, bl);
-    ::decode(destroyed_inodes, bl);
-    if (struct_v >= 2) {
-      ::decode(client_reqs, bl);
-    } else {
-      list<metareqid_t> r;
-      ::decode(r, bl);
-      while (!r.empty()) {
-       client_reqs.push_back(pair<metareqid_t,uint64_t>(r.front(), 0));
-       r.pop_front();
-      }
-    }
-    if (struct_v >= 3) {
-      ::decode(renamed_dirino, bl);
-      ::decode(renamed_dir_frags, 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<EMetaBlob*>& ls);
   // soft stateadd
   uint64_t last_subtree_map;
   uint64_t my_offset;

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 7d049c2055a33b6761490444e05205cedd5a2c0a..9c4e2e244a484bc2bd224a931c926be7d69f4080 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -720,6 +720,164 @@ void EMetaBlob::dirlump::generate_test_instances(list<dirlump*>& ls)
 /**
  * EMetaBlob proper
  */
+void EMetaBlob::encode(bufferlist& bl) const
+{
+  ENCODE_START(5, 5, bl);
+  ::encode(lump_order, bl);
+  ::encode(lump_map, bl);
+  ::encode(roots, bl);
+  ::encode(table_tids, bl);
+  ::encode(opened_ino, bl);
+  ::encode(allocated_ino, bl);
+  ::encode(used_preallocated_ino, bl);
+  ::encode(preallocated_inos, bl);
+  ::encode(client_name, bl);
+  ::encode(inotablev, bl);
+  ::encode(sessionmapv, bl);
+  ::encode(truncate_start, bl);
+  ::encode(truncate_finish, bl);
+  ::encode(destroyed_inodes, bl);
+  ::encode(client_reqs, bl);
+  ::encode(renamed_dirino, bl);
+  ::encode(renamed_dir_frags, bl);
+  ENCODE_FINISH(bl);
+}
+void EMetaBlob::decode(bufferlist::iterator &bl)
+{
+  DECODE_START_LEGACY_COMPAT_LEN(5, 5, 5, bl);
+  ::decode(lump_order, bl);
+  ::decode(lump_map, bl);
+  if (struct_v >= 4) {
+    ::decode(roots, bl);
+  } else {
+    bufferlist rootbl;
+    ::decode(rootbl, bl);
+    if (rootbl.length()) {
+      bufferlist::iterator p = rootbl.begin();
+      roots.push_back(std::tr1::shared_ptr<fullbit>(new fullbit(p)));
+    }
+  }
+  ::decode(table_tids, bl);
+  ::decode(opened_ino, bl);
+  ::decode(allocated_ino, bl);
+  ::decode(used_preallocated_ino, bl);
+  ::decode(preallocated_inos, bl);
+  ::decode(client_name, bl);
+  ::decode(inotablev, bl);
+  ::decode(sessionmapv, bl);
+  ::decode(truncate_start, bl);
+  ::decode(truncate_finish, bl);
+  ::decode(destroyed_inodes, bl);
+  if (struct_v >= 2) {
+    ::decode(client_reqs, bl);
+  } else {
+    list<metareqid_t> r;
+    ::decode(r, bl);
+    while (!r.empty()) {
+       client_reqs.push_back(pair<metareqid_t,uint64_t>(r.front(), 0));
+       r.pop_front();
+    }
+  }
+  if (struct_v >= 3) {
+    ::decode(renamed_dirino, bl);
+    ::decode(renamed_dir_frags, bl);
+  }
+  DECODE_FINISH(bl);
+}
+
+void EMetaBlob::dump(Formatter *f) const
+{
+  f->open_array_section("lumps");
+  for (list<dirfrag_t>::const_iterator i = lump_order.begin();
+       i != lump_order.end(); ++i) {
+    f->open_object_section("lump");
+    f->open_object_section("dirfrag");
+    f->dump_stream("dirfrag") << *i;
+    f->close_section(); // dirfrag
+    f->open_object_section("dirlump");
+    lump_map.at(*i).dump(f);
+    f->close_section(); // dirlump
+    f->close_section(); // lump
+  }
+  f->close_section(); // lumps
+  
+  f->open_array_section("roots");
+  for (list<std::tr1::shared_ptr<fullbit> >::const_iterator i = roots.begin();
+       i != roots.end(); ++i) {
+    f->open_object_section("root");
+    (*i)->dump(f);
+    f->close_section(); // root
+  }
+  f->close_section(); // roots
+
+  f->open_array_section("tableclient tranactions");
+  for (list<pair<__u8,version_t> >::const_iterator i = table_tids.begin();
+       i != table_tids.end(); ++i) {
+    f->open_object_section("transaction");
+    f->dump_int("tid", i->first);
+    f->dump_int("version", i->second);
+    f->close_section(); // transaction
+  }
+  f->close_section(); // tableclient transactions
+  
+  f->dump_int("renamed directory inodeno", renamed_dirino);
+  
+  f->open_array_section("renamed directory fragments");
+  for (list<frag_t>::const_iterator i = renamed_dir_frags.begin();
+       i != renamed_dir_frags.end(); ++i) {
+    f->dump_int("frag", *i);
+  }
+  f->close_section(); // renamed directory fragments
+
+  f->dump_int("inotable version", inotablev);
+  f->dump_int("SesionMap version", sessionmapv);
+  f->dump_int("allocated ino", allocated_ino);
+  
+  f->dump_stream("preallocated inos") << preallocated_inos;
+  f->dump_int("used preallocated ino", used_preallocated_ino);
+
+  f->open_object_section("client name");
+  client_name.dump(f);
+  f->close_section(); // client name
+
+  f->open_array_section("inodes starting a truncate");
+  for(list<inodeno_t>::const_iterator i = truncate_start.begin();
+      i != truncate_start.end(); ++i) {
+    f->dump_int("inodeno", *i);
+  }
+  f->close_section(); // truncate inodes
+  f->open_array_section("inodes finishing a truncated");
+  for(map<inodeno_t,uint64_t>::const_iterator i = truncate_finish.begin();
+      i != truncate_finish.end(); ++i) {
+    f->open_object_section("inode+segment");
+    f->dump_int("inodeno", i->first);
+    f->dump_int("truncate starting segment", i->second);
+    f->close_section(); // truncated inode
+  }
+  f->close_section(); // truncate finish inodes
+
+  f->open_array_section("destroyed inodes");
+  for(vector<inodeno_t>::const_iterator i = destroyed_inodes.begin();
+      i != destroyed_inodes.end(); ++i) {
+    f->dump_int("inodeno", *i);
+  }
+  f->close_section(); // destroyed inodes
+
+  f->open_array_section("client requests");
+  for(list<pair<metareqid_t,uint64_t> >::const_iterator i = client_reqs.begin();
+      i != client_reqs.end(); ++i) {
+    f->open_object_section("Client request");
+    f->dump_stream("request ID") << i->first;
+    f->dump_int("oldest request on client", i->second);
+    f->close_section(); // request
+  }
+  f->close_section(); // client requests
+}
+
+void EMetaBlob::generate_test_instances(list<EMetaBlob*>& ls)
+{
+  ls.push_back(new EMetaBlob());
+}
 
 void EMetaBlob::replay(MDS *mds, LogSegment *logseg, MDSlaveUpdate *slaveup)
 {

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 2b47296b248f508d703e3a78848a6f0c1a6d1d1e..5a7f361efc72b9b844a7219af0f093b8dd7e4ecc 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -138,6 +138,7 @@ TYPE(EMetaBlob::fullbit)
 TYPE(EMetaBlob::remotebit)
 TYPE(EMetaBlob::nullbit)
 TYPE(EMetaBlob::dirlump)
+TYPE(EMetaBlob)
 
 #ifdef WITH_RADOSGW