diff mbox series

[1/3] ceph: add the Octopus,Pacific,Quency feature bits

Message ID 20220331065241.27370-2-xiubli@redhat.com (mailing list archive)
State New, archived
Headers show
Series ceph: only send the metrices supported by the MDS for old cephs | expand

Commit Message

Xiubo Li March 31, 2022, 6:52 a.m. UTC 
From: Xiubo Li <xiubli@redhat.com>

URL: https://tracker.ceph.com/issues/54411
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 fs/ceph/mds_client.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Jeff Layton March 31, 2022, 12:15 p.m. UTC | #1 
On Thu, 2022-03-31 at 14:52 +0800, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
> 
> URL: https://tracker.ceph.com/issues/54411
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>  fs/ceph/mds_client.h | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
> index 33497846e47e..32107c26f50d 100644
> --- a/fs/ceph/mds_client.h
> +++ b/fs/ceph/mds_client.h
> @@ -27,10 +27,13 @@ enum ceph_feature_type {
>  	CEPHFS_FEATURE_RECLAIM_CLIENT,
>  	CEPHFS_FEATURE_LAZY_CAP_WANTED,
>  	CEPHFS_FEATURE_MULTI_RECONNECT,
> -	CEPHFS_FEATURE_DELEG_INO,
> -	CEPHFS_FEATURE_METRIC_COLLECT,
> +	CEPHFS_FEATURE_OCTOPUS,
> +	CEPHFS_FEATURE_DELEG_INO = CEPHFS_FEATURE_OCTOPUS,
> +	CEPHFS_FEATURE_PACIFIC,
> +	CEPHFS_FEATURE_METRIC_COLLECT = CEPHFS_FEATURE_PACIFIC,
> +	CEPHFS_FEATURE_QUINCY,
>  
> -	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_METRIC_COLLECT,
> +	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_QUINCY,
>  };
>  
>  /*

(cc'ing Patrick)

I think we decided a while back to move away from "release" feature
flags like this, because they're ambiguous. We do occasionally backport
features to later stable versions and then the release flag becomes
meaningless.

If the "feature" here is extended metrics, then this should be something
like CEPHFS_FEATURE_METRIC_V2 or METRIC_EXTENDED or something. IOW, the
flag name should describe the feature that we're advertising.
diff mbox series

Patch

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 33497846e47e..32107c26f50d 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -27,10 +27,13 @@  enum ceph_feature_type {
 	CEPHFS_FEATURE_RECLAIM_CLIENT,
 	CEPHFS_FEATURE_LAZY_CAP_WANTED,
 	CEPHFS_FEATURE_MULTI_RECONNECT,
-	CEPHFS_FEATURE_DELEG_INO,
-	CEPHFS_FEATURE_METRIC_COLLECT,
+	CEPHFS_FEATURE_OCTOPUS,
+	CEPHFS_FEATURE_DELEG_INO = CEPHFS_FEATURE_OCTOPUS,
+	CEPHFS_FEATURE_PACIFIC,
+	CEPHFS_FEATURE_METRIC_COLLECT = CEPHFS_FEATURE_PACIFIC,
+	CEPHFS_FEATURE_QUINCY,
 
-	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_METRIC_COLLECT,
+	CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_QUINCY,
 };
 
 /*