From bef2e7a109bed31631211043b1fae4cfb8243d3a Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 14 Sep 2022 21:13:21 +0800 Subject: [PATCH] mds: add CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK feature bit This feature bit could be used to distinguish old and new clients. Fixes: https://tracker.ceph.com/issues/57154 Signed-off-by: Xiubo Li (cherry picked from commit b2046fc7ca30a988094a473c654a0d1cef8ea945) --- src/mds/cephfs_features.cc | 1 + src/mds/cephfs_features.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/cephfs_features.cc b/src/mds/cephfs_features.cc index 4a864076b9d..a0336c8ba58 100644 --- a/src/mds/cephfs_features.cc +++ b/src/mds/cephfs_features.cc @@ -30,6 +30,7 @@ static const std::array feature_names "32bits_retry_fwd", "new_snaprealm_info", "has_owner_uidgid", + "client_mds_auth_caps", }; static_assert(feature_names.size() == CEPHFS_FEATURE_MAX + 1); diff --git a/src/mds/cephfs_features.h b/src/mds/cephfs_features.h index 7d215e2a3e5..3a67e96dba1 100644 --- a/src/mds/cephfs_features.h +++ b/src/mds/cephfs_features.h @@ -48,7 +48,8 @@ namespace ceph { #define CEPHFS_FEATURE_32BITS_RETRY_FWD 18 #define CEPHFS_FEATURE_NEW_SNAPREALM_INFO 19 #define CEPHFS_FEATURE_HAS_OWNER_UIDGID 20 -#define CEPHFS_FEATURE_MAX 20 +#define CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK 21 +#define CEPHFS_FEATURE_MAX 21 #define CEPHFS_FEATURES_ALL { \ 0, 1, 2, 3, 4, \ @@ -70,6 +71,7 @@ namespace ceph { CEPHFS_FEATURE_32BITS_RETRY_FWD, \ CEPHFS_FEATURE_NEW_SNAPREALM_INFO, \ CEPHFS_FEATURE_HAS_OWNER_UIDGID, \ + CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK \ } #define CEPHFS_METRIC_FEATURES_ALL { \ -- 2.39.5