From 49930ad8a3402ea4047a05d12823f341bc930ac1 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 1 Apr 2019 17:03:45 -0700 Subject: [PATCH] mds: add Octopus cephfs feature bit Signed-off-by: Patrick Donnelly --- src/mds/Server.cc | 6 ++++-- src/mds/cephfs_features.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index beb5e1e52374..ee8521324d0f 100644 --- 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 e2a5a6cc3068..1e09cca71d64 100644 --- 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 -- 2.47.3