From a627adf4c5aea919e8b4040bccfe06ed6c09a152 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 1 Apr 2019 16:50:43 -0700 Subject: [PATCH] mds: add cephfs feature bit for Nautilus Fixes: http://tracker.ceph.com/issues/39078 Signed-off-by: Patrick Donnelly (cherry picked from commit dcd6e97944f1eefb236c5b680569c0e7c085a692) --- src/mds/Server.cc | 4 +++- src/mds/cephfs_features.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 92a9fdd9eb3c..8bfd19cbcfaa 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -1363,7 +1363,9 @@ void Server::update_required_client_features() vector 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 5a0a8599c4c2..66752af26270 100644 --- 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 -- 2.47.3