FSMap: when upgrading from MDSMap, do not initialize from a non-exist…

…ent FS Signed-off-by: Greg Farnum <gfarnum@redhat.com>
gregsfortytwo · Mar 11, 2016 · 1634827 · jcsp · Mar 12, 2016 · 1634827
1 parent 09fce2d
commit 1634827
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
@@ -332,8 +332,10 @@ void FSMap::decode(bufferlist::iterator& p)
     *migrate_fs = legacy_fs;
     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;
+    if (migrate_fs->mds_map.enabled) {
+      legacy_client_fscid = migrate_fs->fscid;
+      filesystems[migrate_fs->fscid] = migrate_fs;
+    }
     compat = migrate_fs->mds_map.compat;
     enable_multiple = false;
   } else {