From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Feb 2016 14:43:32 +0000 (-0500)
Subject: mds/MDSMap: add file layout v2 incompat feature
X-Git-Tag: v10.1.0~241^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f47cd76d28b48db2f0443b17b73e2f11943d4ba;p=ceph.git

mds/MDSMap: add file layout v2 incompat feature

The existing MDSMonitor machinations already add this to the MDSMap to
boot out old MDS's.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 9c464b148a94..aa7949f2bbc1 100644
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -37,6 +37,7 @@ CompatSet get_mdsmap_compat_set_all() {
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_OMAPDIRFRAG);
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_INLINE);
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_NOANCHOR);
+  feature_incompat.insert(MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2);
 
   return CompatSet(feature_compat, feature_ro_compat, feature_incompat);
 }
@@ -52,6 +53,7 @@ CompatSet get_mdsmap_compat_set_default() {
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_ENCODING);
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_OMAPDIRFRAG);
   feature_incompat.insert(MDS_FEATURE_INCOMPAT_NOANCHOR);
+  feature_incompat.insert(MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2);
 
   return CompatSet(feature_compat, feature_ro_compat, feature_incompat);
 }
diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 4cc89656e0da..6be2473433ca 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -70,6 +70,7 @@ extern CompatSet get_mdsmap_compat_set_base(); // pre v0.20
 #define MDS_FEATURE_INCOMPAT_OMAPDIRFRAG CompatSet::Feature(6, "dirfrag is stored in omap")
 #define MDS_FEATURE_INCOMPAT_INLINE CompatSet::Feature(7, "mds uses inline data")
 #define MDS_FEATURE_INCOMPAT_NOANCHOR CompatSet::Feature(8, "no anchor table")
+#define MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2 CompatSet::Feature(8, "file layout v2")
 
 #define MDS_FS_NAME_DEFAULT "cephfs"