mds: MDSMap now uses modern encoding

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

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 5406b21209238e331eb5816d79e7a8d823f81e45..08e1a554d2553be07b3e7b5ef9ebb43983b25321 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -14,7 +14,6 @@
 
 
 #include "MDSMap.h"
-#include "include/ceph_features.h"
 
 #include <sstream>
 using std::stringstream;
@@ -117,6 +116,22 @@ void MDSMap::dump(Formatter *f) const
   f->dump_int("metadata_pool", metadata_pool);
 }
 
+void MDSMap::generate_test_instances(list<MDSMap*>& ls)
+{
+  MDSMap *m = new MDSMap();
+  m->max_mds = 1;
+  m->data_pools.insert(0);
+  m->metadata_pool = 1;
+  m->cas_pool = 2;
+  m->compat = get_mdsmap_compat_set();
+
+  // these aren't the defaults, just in case anybody gets confused
+  m->session_timeout = 61;
+  m->session_autoclose = 301;
+  m->max_file_size = 1<<24;
+  ls.push_back(m);
+}
+
 void MDSMap::print(ostream& out) 
 {
   out << "epoch\t" << epoch << "\n";
@@ -314,42 +329,70 @@ void MDSMap::encode(bufferlist& bl, uint64_t features) const
     int32_t m = cas_pool;
     ::encode(m, bl);
     return;
+  } else if ((features & CEPH_FEATURE_MDSENC) == 0) {
+    __u16 v = 3;
+    ::encode(v, bl);
+    ::encode(epoch, bl);
+    ::encode(flags, bl);
+    ::encode(last_failure, bl);
+    ::encode(root, bl);
+    ::encode(session_timeout, bl);
+    ::encode(session_autoclose, bl);
+    ::encode(max_file_size, bl);
+    ::encode(max_mds, bl);
+    ::encode(mds_info, bl);
+    ::encode(data_pools, bl);
+    ::encode(cas_pool, bl);
+
+    // kclient ignores everything from here
+    __u16 ev = 5;
+    ::encode(ev, bl);
+    ::encode(compat, bl);
+    ::encode(metadata_pool, bl);
+    ::encode(created, bl);
+    ::encode(modified, bl);
+    ::encode(tableserver, bl);
+    ::encode(in, bl);
+    ::encode(inc, bl);
+    ::encode(up, bl);
+    ::encode(failed, bl);
+    ::encode(stopped, bl);
+    ::encode(last_failure_osd_epoch, bl);
+  } else {// have MDS encoding feature!
+    ENCODE_START(4, 4, bl);
+    ::encode(epoch, bl);
+    ::encode(flags, bl);
+    ::encode(last_failure, bl);
+    ::encode(root, bl);
+    ::encode(session_timeout, bl);
+    ::encode(session_autoclose, bl);
+    ::encode(max_file_size, bl);
+    ::encode(max_mds, bl);
+    ::encode(mds_info, bl);
+    ::encode(data_pools, bl);
+    ::encode(cas_pool, bl);
+
+    // kclient ignores everything from here
+    __u16 ev = 5;
+    ::encode(ev, bl);
+    ::encode(compat, bl);
+    ::encode(metadata_pool, bl);
+    ::encode(created, bl);
+    ::encode(modified, bl);
+    ::encode(tableserver, bl);
+    ::encode(in, bl);
+    ::encode(inc, bl);
+    ::encode(up, bl);
+    ::encode(failed, bl);
+    ::encode(stopped, bl);
+    ::encode(last_failure_osd_epoch, bl);
+    ENCODE_FINISH(bl);
   }
-
-  __u16 v = 3;
-  ::encode(v, bl);
-  ::encode(epoch, bl);
-  ::encode(flags, bl);
-  ::encode(last_failure, bl);
-  ::encode(root, bl);
-  ::encode(session_timeout, bl);
-  ::encode(session_autoclose, bl);
-  ::encode(max_file_size, bl);
-  ::encode(max_mds, bl);
-  ::encode(mds_info, bl);
-  ::encode(data_pools, bl);
-  ::encode(cas_pool, bl);
-
-  // kclient ignores everything from here
-  __u16 ev = 5;
-  ::encode(ev, bl);
-  ::encode(compat, bl);
-  ::encode(metadata_pool, bl);
-  ::encode(created, bl);
-  ::encode(modified, bl);
-  ::encode(tableserver, bl);
-  ::encode(in, bl);
-  ::encode(inc, bl);
-  ::encode(up, bl);
-  ::encode(failed, bl);
-  ::encode(stopped, bl);
-  ::encode(last_failure_osd_epoch, bl);
 }
 
 void MDSMap::decode(bufferlist::iterator& p)
 {
-  __u16 v;
-  ::decode(v, p);
+  DECODE_START_LEGACY_COMPAT_LEN_16(4, 4, 4, p);
   ::decode(epoch, p);
   ::decode(flags, p);
   ::decode(last_failure, p);
@@ -359,7 +402,7 @@ void MDSMap::decode(bufferlist::iterator& p)
   ::decode(max_file_size, p);
   ::decode(max_mds, p);
   ::decode(mds_info, p);
-  if (v < 3) {
+  if (struct_v < 3) {
     __u32 n;
     ::decode(n, p);
     while (n--) {
@@ -377,7 +420,7 @@ void MDSMap::decode(bufferlist::iterator& p)
 
   // kclient ignores everything from here
   __u16 ev = 1;
-  if (v >= 2)
+  if (struct_v >= 2)
     ::decode(ev, p);
   if (ev >= 3)
     ::decode(compat, p);
@@ -400,4 +443,5 @@ void MDSMap::decode(bufferlist::iterator& p)
   ::decode(stopped, p);
   if (ev >= 4)
     ::decode(last_failure_osd_epoch, p);
+  DECODE_FINISH(p);
 }

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index a683df641a6da6a743fc484ea5519881429dcde6..2a5ee888169c53f5dd45776e7a8a54ab1284b3cc 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -30,6 +30,7 @@ using namespace std;
 #include "common/config.h"
 
 #include "include/CompatSet.h"
+#include "include/ceph_features.h"
 #include "common/Formatter.h"
 
 /*
@@ -487,6 +488,7 @@ public:
   void print_summary(ostream& out);
 
   void dump(Formatter *f) const;
+  static void generate_test_instances(list<MDSMap*>& ls);
 };
 WRITE_CLASS_ENCODER(MDSMap::mds_info_t)
 WRITE_CLASS_ENCODER_FEATURES(MDSMap)

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index a2fa626e7c35112cff3595ff269702889dcaf7c6..c36da829a34cdb796749c9c4ca0a5dead95bba09 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -109,6 +109,9 @@ TYPE(string_snap_t)
 TYPE(MDSCacheObjectInfo)
 TYPE(mds_table_pending_t)
 
+#include "mds/MDSMap.h"
+TYPE_FEATUREFUL(MDSMap)
+
 #ifdef WITH_RADOSGW
 
 #include "rgw/rgw_rados.h"