diff options
| author | Sage Weil <sage@redhat.com> | 2019-03-23 08:19:53 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-04-02 23:19:43 +0200 |
| commit | 43c688289c98a4d7f2c5c7148c48b24e34e7a80e (patch) | |
| tree | b18277c312a29e4770ace1ccdd6f101e59aa3f35 /src/include/ceph_features.h | |
| parent | include/ceph_features: retire ERASURE_CODE_PLUGINS_V2 (diff) | |
| download | ceph-43c688289c98a4d7f2c5c7148c48b24e34e7a80e.tar.xz ceph-43c688289c98a4d7f2c5c7148c48b24e34e7a80e.zip | |
include/ceph_features: retire 7 other old features
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/include/ceph_features.h')
| -rw-r--r-- | src/include/ceph_features.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index b0d9f23cff2..701a0ab9922 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -162,15 +162,16 @@ DEFINE_CEPH_FEATURE(48, 1, CRUSH_V4) // 4.1 DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_MIN_SIZE_RECOVERY, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_PROXY_FEATURES, JEWEL, LUMINOUS) // overlap -DEFINE_CEPH_FEATURE_DEPRECATED(50, 1, MON_METADATA, MIMIC) -DEFINE_CEPH_FEATURE_DEPRECATED(51, 1, OSD_BITWISE_HOBJ_SORT, MIMIC) -DEFINE_CEPH_FEATURE_DEPRECATED(52, 1, OSD_PROXY_WRITE_FEATURES, MIMIC) -DEFINE_CEPH_FEATURE_DEPRECATED(53, 1, ERASURE_CODE_PLUGINS_V3, MIMIC) -DEFINE_CEPH_FEATURE_DEPRECATED(54, 1, OSD_HITSET_GMT, MIMIC) -DEFINE_CEPH_FEATURE_DEPRECATED(55, 1, HAMMER_0_94_4, MIMIC) +DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS) +DEFINE_CEPH_FEATURE_RETIRED(51, 1, OSD_BITWISE_HOBJ_SORT, MIMIC, OCTOPUS) +DEFINE_CEPH_FEATURE_RETIRED(52, 1, OSD_PROXY_WRITE_FEATURES, MIMIC, OCTOPUS) +DEFINE_CEPH_FEATURE_RETIRED(53, 1, ERASURE_CODE_PLUGINS_V3, MIMIC, OCTOPUS) +DEFINE_CEPH_FEATURE_RETIRED(54, 1, OSD_HITSET_GMT, MIMIC, OCTOPUS) +DEFINE_CEPH_FEATURE_RETIRED(55, 1, HAMMER_0_94_4, MIMIC, OCTOPUS) + DEFINE_CEPH_FEATURE(56, 1, NEW_OSDOP_ENCODING) // 4.13 (for pg_pool_t >= v25) DEFINE_CEPH_FEATURE(57, 1, MON_STATEFUL_SUB) // 4.13 -DEFINE_CEPH_FEATURE_DEPRECATED(57, 1, MON_ROUTE_OSDMAP, MIMIC) // overlap +DEFINE_CEPH_FEATURE_RETIRED(57, 1, MON_ROUTE_OSDMAP, MIMIC, OCTOPUS) // overlap DEFINE_CEPH_FEATURE(57, 1, SERVER_JEWEL) // overlap DEFINE_CEPH_FEATURE(58, 1, CRUSH_TUNABLES5) // 4.5 DEFINE_CEPH_FEATURE(58, 1, NEW_OSDOPREPLY_ENCODING) // overlap @@ -225,14 +226,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_FADVISE_FLAGS | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ - DEPRECATED_CEPH_FEATURE_MON_METADATA | \ - DEPRECATED_CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT | \ - DEPRECATED_CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 | \ - DEPRECATED_CEPH_FEATURE_OSD_PROXY_WRITE_FEATURES | \ - DEPRECATED_CEPH_FEATURE_OSD_HITSET_GMT | \ - DEPRECATED_CEPH_FEATURE_HAMMER_0_94_4 | \ CEPH_FEATURE_MON_STATEFUL_SUB | \ - DEPRECATED_CEPH_FEATURE_MON_ROUTE_OSDMAP | \ CEPH_FEATURE_CRUSH_TUNABLES5 | \ CEPH_FEATURE_SERVER_JEWEL | \ CEPH_FEATURE_FS_FILE_LAYOUT_V2 | \ |