diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-03-19 10:58:37 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2014-04-05 00:07:29 -0400 |
commit | 07bd7de47a65767432ceb66d4ab30cdc05ed2b35 (patch) | |
tree | 3d422993067317be6f17a58c4ddff28bcd157544 /include | |
parent | d83ed858f144e3cfbef883d4bc499113cdddabeb (diff) |
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: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ceph/ceph_features.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index 138448f766b4..77c097fe9ea9 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h | |||
@@ -43,6 +43,13 @@ | |||
43 | #define CEPH_FEATURE_CRUSH_V2 (1ULL<<36) /* new indep; SET_* steps */ | 43 | #define CEPH_FEATURE_CRUSH_V2 (1ULL<<36) /* new indep; SET_* steps */ |
44 | #define CEPH_FEATURE_EXPORT_PEER (1ULL<<37) | 44 | #define CEPH_FEATURE_EXPORT_PEER (1ULL<<37) |
45 | #define CEPH_FEATURE_OSD_ERASURE_CODES (1ULL<<38) | 45 | #define CEPH_FEATURE_OSD_ERASURE_CODES (1ULL<<38) |
46 | #define CEPH_FEATURE_OSD_TMAP2OMAP (1ULL<<38) /* overlap with EC */ | ||
47 | /* The process supports new-style OSDMap encoding. Monitors also use | ||
48 | this bit to determine if peers support NAK messages. */ | ||
49 | #define CEPH_FEATURE_OSDMAP_ENC (1ULL<<39) | ||
50 | #define CEPH_FEATURE_MDS_INLINE_DATA (1ULL<<40) | ||
51 | #define CEPH_FEATURE_CRUSH_TUNABLES3 (1ULL<<41) | ||
52 | #define CEPH_FEATURE_OSD_PRIMARY_AFFINITY (1ULL<<41) /* overlap w/ tunables3 */ | ||
46 | 53 | ||
47 | /* | 54 | /* |
48 | * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature | 55 | * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature |
@@ -82,7 +89,8 @@ static inline u64 ceph_sanitize_features(u64 features) | |||
82 | CEPH_FEATURE_OSDHASHPSPOOL | \ | 89 | CEPH_FEATURE_OSDHASHPSPOOL | \ |
83 | CEPH_FEATURE_OSD_CACHEPOOL | \ | 90 | CEPH_FEATURE_OSD_CACHEPOOL | \ |
84 | CEPH_FEATURE_CRUSH_V2 | \ | 91 | CEPH_FEATURE_CRUSH_V2 | \ |
85 | CEPH_FEATURE_EXPORT_PEER) | 92 | CEPH_FEATURE_EXPORT_PEER | \ |
93 | CEPH_FEATURE_CRUSH_TUNABLES3) | ||
86 | 94 | ||
87 | #define CEPH_FEATURES_REQUIRED_DEFAULT \ | 95 | #define CEPH_FEATURES_REQUIRED_DEFAULT \ |
88 | (CEPH_FEATURE_NOSRCADDR | \ | 96 | (CEPH_FEATURE_NOSRCADDR | \ |