mds: add Octopus cephfs feature bit

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index beb5e1e52374114b8f991fd66ed6fcf9886b373b..ee8521324d0f2e9eb02a8886cc20d7bbd08f9c7b 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1366,9 +1366,11 @@ void Server::update_required_client_features()
   static_assert(CEPHFS_CURRENT_RELEASE == CEPH_RELEASE_MAX-1);
 
   int min_compat = mds->mdsmap->get_min_compat_client();
-  if (min_compat >= CEPH_RELEASE_NAUTILUS) {
+  if (min_compat >= CEPH_RELEASE_OCTOPUS)
+    bits.push_back(CEPHFS_FEATURE_OCTOPUS);
+  else if (min_compat >= CEPH_RELEASE_NAUTILUS)
     bits.push_back(CEPHFS_FEATURE_NAUTILUS);
-  } else if (min_compat >= CEPH_RELEASE_MIMIC)
+  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 e2a5a6cc3068d3989f9b8cb118f38274f272f6e3..1e09cca71d64c026a567fbca2496315775b9d8ee 100644 (file)
--- a/src/mds/cephfs_features.h
+++ b/src/mds/cephfs_features.h
@@ -32,6 +32,7 @@
 #define CEPHFS_FEATURE_LAZY_CAP_WANTED  11
 #define CEPHFS_FEATURE_MULTI_RECONNECT  12
 #define CEPHFS_FEATURE_NAUTILUS         12
+#define CEPHFS_FEATURE_OCTOPUS          13
 
 #define CEPHFS_FEATURES_ALL {          \
   0, 1, 2, 3, 4,                       \
@@ -44,6 +45,7 @@
   CEPHFS_FEATURE_LAZY_CAP_WANTED,      \
   CEPHFS_FEATURE_MULTI_RECONNECT,      \
   CEPHFS_FEATURE_NAUTILUS,              \
+  CEPHFS_FEATURE_OCTOPUS,               \
 }
 
 #define CEPHFS_FEATURES_MDS_SUPPORTED CEPHFS_FEATURES_ALL