mdsmap: int64_t pool ids

Encode old-format maps for clients without PGID64 feature bit.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 81e18a0da0236202dbd07fe3c3b24a4f94dc8448..b6b7f6929f3add82cb6dd7b0b4ccbf84baee8f50 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -123,7 +123,7 @@ void MDSMap::dump(Formatter *f) const
   }
   f->close_section();
   f->open_array_section("data_pools");
-  for (vector<__u32>::const_iterator p = data_pg_pools.begin(); p != data_pg_pools.end(); ++p)
+  for (vector<int64_t>::const_iterator p = data_pg_pools.begin(); p != data_pg_pools.end(); ++p)
     f->dump_int("pool", *p);
   f->close_section();
   f->dump_int("metadata_pool", metadata_pg_pool);

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 54adf3d991b31990955754e2b61a857fbc1607d3..a9c71703992da7c37c9b010516f825f3ab61aab0 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -174,9 +174,9 @@ protected:
   __u32 session_autoclose;
   uint64_t max_file_size;
 
-  vector<__u32> data_pg_pools;  // file data pg_pools available to clients (via an ioctl).  first is the default.
-  __s32 cas_pg_pool;            // where CAS objects go
-  __u32 metadata_pg_pool;       // where fs metadata objects go
+  vector<int64_t> data_pg_pools;  // file data pg_pools available to clients (via an ioctl).  first is the default.
+  int64_t cas_pg_pool;            // where CAS objects go
+  int64_t metadata_pg_pool;       // where fs metadata objects go
   
   /*
    * in: the set of logical mds #'s that define the cluster.  this is the set
@@ -239,10 +239,10 @@ public:
   int get_tableserver() const { return tableserver; }
   int get_root() const { return root; }
 
-  const vector<__u32> &get_data_pg_pools() const { return data_pg_pools; }
-  __u32 get_data_pg_pool() const { return data_pg_pools[0]; }
-  __s32 get_cas_pg_pool() const { return cas_pg_pool; }
-  __u32 get_metadata_pg_pool() const { return metadata_pg_pool; }
+  const vector<int64_t> &get_data_pg_pools() const { return data_pg_pools; }
+  int64_t get_data_pg_pool() const { return data_pg_pools[0]; }
+  int64_t get_cas_pg_pool() const { return cas_pg_pool; }
+  int64_t get_metadata_pg_pool() const { return metadata_pg_pool; }
 
   const map<uint64_t,mds_info_t>& get_mds_info() { return mds_info; }
   const mds_info_t& get_mds_info_gid(uint64_t gid) {
@@ -269,11 +269,11 @@ public:
   int get_num_failed() { return failed.size(); }
 
   // data pools
-  void add_data_pg_pool(__u32 poolid) {
+  void add_data_pg_pool(int64_t poolid) {
     data_pg_pools.push_back(poolid);
   }
-  int remove_data_pg_pool(__u32 poolid) {
-    for (vector<__u32>::iterator p = data_pg_pools.begin();
+  int remove_data_pg_pool(int64_t poolid) {
+    for (vector<int64_t>::iterator p = data_pg_pools.begin();
         p != data_pg_pools.end();
         ++p) {
       if (*p == poolid) {
@@ -494,9 +494,7 @@ public:
     return -1;
   }
 
-
-
-  void encode(bufferlist& bl) const {
+  void encode_client_old(bufferlist& bl) const {
     __u16 v = 2;
     ::encode(v, bl);
     ::encode(epoch, bl);
@@ -508,11 +506,32 @@ public:
     ::encode(max_file_size, bl);
     ::encode(max_mds, bl);
     ::encode(mds_info, bl);
+    __u32 n = data_pg_pools.size();
+    ::encode(n, bl);
+    for (vector<int64_t>::const_iterator p = data_pg_pools.begin(); p != data_pg_pools.end(); ++p) {
+      n = *p;
+      ::encode(n, bl);
+    }
+    int32_t m = cas_pg_pool;
+    ::encode(m, bl);
+  }
+  void encode(bufferlist& bl) const {
+    __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_pg_pools, bl);
     ::encode(cas_pg_pool, bl);
 
     // kclient ignores everything from here
-    __u16 ev = 4;
+    __u16 ev = 5;
     ::encode(ev, bl);
     ::encode(compat, bl);
     ::encode(metadata_pg_pool, bl);
@@ -538,8 +557,21 @@ public:
     ::decode(max_file_size, p);
     ::decode(max_mds, p);
     ::decode(mds_info, p);
-    ::decode(data_pg_pools, p);
-    ::decode(cas_pg_pool, p);
+    if (v < 3) {
+      __u32 n;
+      ::decode(n, p);
+      while (n--) {
+       __u32 m;
+       ::decode(m, p);
+       data_pg_pools.push_back(m);
+      }
+      __s32 s;
+      ::decode(s, p);
+      cas_pg_pool = s;
+    } else {
+      ::decode(data_pg_pools, p);
+      ::decode(cas_pg_pool, p);
+    }
 
     // kclient ignores everything from here
     __u16 ev = 1;
@@ -549,7 +581,13 @@ public:
       ::decode(compat, p);
     else
       compat = mdsmap_compat_base;
-    ::decode(metadata_pg_pool, p);
+    if (ev < 5) {
+      __u32 n;
+      ::decode(n, p);
+      metadata_pg_pool = n;
+    } else {
+      ::decode(metadata_pg_pool, p);
+    }
     ::decode(created, p);
     ::decode(modified, p);
     ::decode(tableserver, p);

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index 443020f806d2fcd04ddf84f89f9fd90e0e1cf9fd..26461477d1b48f7508f4c17343562d57e4587ef4 100644 (file)
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -114,7 +114,7 @@ void SnapServer::_commit(version_t tid)
     dout(7) << "commit " << tid << " destroy " << sn << " seq " << seq << dendl;
     snaps.erase(sn);
 
-    for (vector<__u32>::const_iterator p = mds->mdsmap->get_data_pg_pools().begin();
+    for (vector<int64_t>::const_iterator p = mds->mdsmap->get_data_pg_pools().begin();
         p != mds->mdsmap->get_data_pg_pools().end();
         p++) {
       need_to_purge[*p].insert(sn);

diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h
index 28c8169627b85c24c5e4bbf63b5419e78e08b31a..2e9ed52299f582eca2c99ce9c76122c178227041 100644 (file)
--- a/src/messages/MMDSMap.h
+++ b/src/messages/MMDSMap.h
@@ -79,6 +79,13 @@ public:
   void encode_payload(CephContext *cct) {
     ::encode(fsid, payload);
     ::encode(epoch, payload);
+    if (connection && !connection->has_feature(CEPH_FEATURE_PGID64)) {
+      // reencode for old clients.
+      MDSMap m(cct);
+      m.decode(encoded);
+      encoded.clear();
+      m.encode_client_old(encoded);
+    }
     ::encode(encoded, payload);
   }
 };