Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bd7de4 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Sage Weil
Browse files

crush: support chooseleaf_vary_r tunable (tunables3) by default 



Add TUNABLES3 feature (chooseleaf_vary_r tunable) to a set of features
supported by default.

Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent d83ed858

include/linux/ceph/ceph_features.h

+9 −1
Original line number Diff line number Diff line
@@ -43,6 +43,13 @@ 
#define CEPH_FEATURE_CRUSH_V2      (1ULL<<36)  /* new indep; SET_* steps */

#define CEPH_FEATURE_EXPORT_PEER   (1ULL<<37)

#define CEPH_FEATURE_OSD_ERASURE_CODES (1ULL<<38)

#define CEPH_FEATURE_OSD_TMAP2OMAP (1ULL<<38)   /* overlap with EC */

/* The process supports new-style OSDMap encoding. Monitors also use

   this bit to determine if peers support NAK messages. */

#define CEPH_FEATURE_OSDMAP_ENC    (1ULL<<39)

#define CEPH_FEATURE_MDS_INLINE_DATA     (1ULL<<40)

#define CEPH_FEATURE_CRUSH_TUNABLES3     (1ULL<<41)

#define CEPH_FEATURE_OSD_PRIMARY_AFFINITY (1ULL<<41)  /* overlap w/ tunables3 */



/*

 * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
@@ -82,7 +89,8 @@ static inline u64 ceph_sanitize_features(u64 features) 
	 CEPH_FEATURE_OSDHASHPSPOOL |		\

	 CEPH_FEATURE_OSD_CACHEPOOL |		\

	 CEPH_FEATURE_CRUSH_V2 |		\

	 CEPH_FEATURE_EXPORT_PEER)

	 CEPH_FEATURE_EXPORT_PEER |		\

	 CEPH_FEATURE_CRUSH_TUNABLES3)



#define CEPH_FEATURES_REQUIRED_DEFAULT   \

	(CEPH_FEATURE_NOSRCADDR |	 \