mds: add cephfs feature bit for Nautilus

Fixes: http://tracker.ceph.com/issues/39078
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit dcd6e97944f1eefb236c5b680569c0e7c085a692)

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 92a9fdd9eb3c9066c51fcd6d6c9fabfa5e05c1a3..8bfd19cbcfaad791a21feeb7348724b1ab4faeeb 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1363,7 +1363,9 @@ void Server::update_required_client_features()
   vector<size_t> bits = CEPHFS_FEATURES_MDS_REQUIRED;
 
   int min_compat = mds->mdsmap->get_min_compat_client();
-  if (min_compat >= CEPH_RELEASE_MIMIC)
+  if (min_compat >= CEPH_RELEASE_NAUTILUS) {
+    bits.push_back(CEPHFS_FEATURE_NAUTILUS);
+  } else if (min_compat >= CEPH_RELEASE_MIMIC)
     bits.push_back(CEPHFS_FEATURE_MIMIC);
   else if (min_compat >= CEPH_RELEASE_LUMINOUS)
     bits.push_back(CEPHFS_FEATURE_LUMINOUS);

diff --git a/src/mds/cephfs_features.h b/src/mds/cephfs_features.h
index 5a0a8599c4c2dd3296e4c60394b9e80c64ae3f08..66752af26270eedbe7a4ee07f7da1e0ab5261e71 100644 (file)
--- a/src/mds/cephfs_features.h
+++ b/src/mds/cephfs_features.h
@@ -27,6 +27,7 @@
 #define CEPHFS_FEATURE_RECLAIM_CLIENT  10
 #define CEPHFS_FEATURE_LAZY_CAP_WANTED  11
 #define CEPHFS_FEATURE_MULTI_RECONNECT  12
+#define CEPHFS_FEATURE_NAUTILUS         12
 
 #define CEPHFS_FEATURES_ALL {          \
   0, 1, 2, 3, 4,                       \
@@ -38,6 +39,7 @@
   CEPHFS_FEATURE_RECLAIM_CLIENT,       \
   CEPHFS_FEATURE_LAZY_CAP_WANTED,      \
   CEPHFS_FEATURE_MULTI_RECONNECT,      \
+  CEPHFS_FEATURE_NAUTILUS,              \
 }
 
 #define CEPHFS_FEATURES_MDS_SUPPORTED CEPHFS_FEATURES_ALL