ceph: decode updated mdsmap format

The mds map now uses the global_id as the 'key' (instead of the addr,
which was a poor choice).

This is protocol change.

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

3 files changed, 11 insertions, 7 deletions

diff --git a/fs/ceph/ceph_fs.h b/fs/ceph/ceph_fs.h
index 1e96a9a87d8..4e5f49c738d 100644
--- a/fs/ceph/ceph_fs.h
+++ b/fs/ceph/ceph_fs.h
@@ -39,7 +39,7 @@
 #define CEPH_MDS_PROTOCOL     9 /* cluster internal */
 #define CEPH_MON_PROTOCOL     5 /* cluster internal */
 #define CEPH_OSDC_PROTOCOL   22 /* server/client */
-#define CEPH_MDSC_PROTOCOL   29 /* server/client */
+#define CEPH_MDSC_PROTOCOL   30 /* server/client */
 #define CEPH_MONC_PROTOCOL   15 /* server/client */
 
 
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
index 4226c810ce2..cad8d25861e 100644
--- a/fs/ceph/mdsmap.c
+++ b/fs/ceph/mdsmap.c
@@ -76,6 +76,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
         /* pick out active nodes from mds_info (state > 0) */
         n = ceph_decode_32(p);
         for (i = 0; i < n; i++) {
+                u64 global_id;
                 u32 namelen;
                 s32 mds, inc, state;
                 u64 state_seq;
@@ -84,10 +85,10 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
                 u32 num_export_targets;
                 void *pexport_targets = NULL;
 
-                ceph_decode_need(p, end, sizeof(addr) + 1 + sizeof(u32), bad);
-                ceph_decode_copy(p, &addr, sizeof(addr));
-                ceph_decode_addr(&addr);
+                ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad);
+                global_id = ceph_decode_64(p);
                 infoversion = ceph_decode_8(p);
+                *p += sizeof(u64);
                 namelen = ceph_decode_32(p);  /* skip mds name */
                 *p += namelen;
 
@@ -99,7 +100,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
                 inc = ceph_decode_32(p);
                 state = ceph_decode_32(p);
                 state_seq = ceph_decode_64(p);
-                *p += sizeof(addr);
+                ceph_decode_copy(p, &addr, sizeof(addr));
+                ceph_decode_addr(&addr);
                 *p += sizeof(struct ceph_timespec);
                 *p += sizeof(u32);
                 ceph_decode_32_safe(p, end, namelen, bad);
@@ -112,10 +114,11 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
                         num_export_targets = 0;
                 }
 
-                dout("mdsmap_decode %d/%d mds%d.%d %s %s\n",
-                     i+1, n, mds, inc, pr_addr(&addr.in_addr),
+                dout("mdsmap_decode %d/%d %lld mds%d.%d %s %s\n",
+                     i+1, n, global_id, mds, inc, pr_addr(&addr.in_addr),
                      ceph_mds_state_name(state));
                 if (mds >= 0 && mds < m->m_max_mds && state > 0) {
+                        m->m_info[mds].global_id = global_id;
                         m->m_info[mds].state = state;
                         m->m_info[mds].addr = addr;
                         m->m_info[mds].num_export_targets = num_export_targets;
diff --git a/fs/ceph/mdsmap.h b/fs/ceph/mdsmap.h
index d317308648f..eacc131aa5c 100644
--- a/fs/ceph/mdsmap.h
+++ b/fs/ceph/mdsmap.h
@@ -9,6 +9,7 @@
  * we limit fields to those the client actually xcares about
  */
 struct ceph_mds_info {
+        u64 global_id;
         struct ceph_entity_addr addr;
         s32 state;
         int num_export_targets;