From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 11 Mar 2016 21:41:48 +0000 (-0800)
Subject: FSMap: actually include the legacy MDSMap in Filesystems when upgrading
X-Git-Tag: v10.1.0~136^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2cc736c39ee3845dbb50c651638a58b34ba1b275;p=ceph-ci.git

FSMap: actually include the legacy MDSMap in Filesystems when upgrading

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index 1ce21d0f9c1..5257a72dc18 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -333,6 +333,7 @@ void FSMap::decode(bufferlist::iterator& p)
     migrate_fs->fscid = FS_CLUSTER_ID_ANONYMOUS;
     migrate_fs->mds_map.fs_name = "default";
     legacy_client_fscid = migrate_fs->fscid;
+    filesystems[migrate_fs->fscid] = migrate_fs;
     compat = migrate_fs->mds_map.compat;
     enable_multiple = false;
   } else {