diff options
| author | Yuri Weinstein <yuri.weinstein@gmail.com> | 2017-10-31 21:56:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 21:56:20 +0100 |
| commit | 87cfeae774c798e8653c8f75c3a56913c7bae6a7 (patch) | |
| tree | c407b4b700e03e03aee52f57c922addabab2a527 /src/include/ceph_features.h | |
| parent | Merge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch (diff) | |
| parent | include/ceph_features: deprecated OSD_ERASURE_CODES (diff) | |
| download | ceph-87cfeae774c798e8653c8f75c3a56913c7bae6a7.tar.xz ceph-87cfeae774c798e8653c8f75c3a56913c7bae6a7.zip | |
Merge pull request #18546 from liewegas/wip-deprecate-features
include/ceph_features: deprecate a bunch of features
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Diffstat (limited to 'src/include/ceph_features.h')
| -rw-r--r-- | src/include/ceph_features.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 5dcc24a85d3..1ab26f5342e 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -125,15 +125,14 @@ DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL) DEFINE_CEPH_FEATURE(36, 1, CRUSH_V2) DEFINE_CEPH_FEATURE(37, 1, EXPORT_PEER) -DEFINE_CEPH_FEATURE(38, 1, OSD_ERASURE_CODES) -DEFINE_CEPH_FEATURE(38, 1, OSD_OSD_TMAP2OMAP) // overlap +DEFINE_CEPH_FEATURE_DEPRECATED(38, 1, OSD_ERASURE_CODES, MIMIC) DEFINE_CEPH_FEATURE(39, 1, OSDMAP_ENC) DEFINE_CEPH_FEATURE(40, 1, MDS_INLINE_DATA) DEFINE_CEPH_FEATURE(41, 1, CRUSH_TUNABLES3) DEFINE_CEPH_FEATURE(41, 1, OSD_PRIMARY_AFFINITY) // overlap DEFINE_CEPH_FEATURE(42, 1, MSGR_KEEPALIVE2) DEFINE_CEPH_FEATURE(43, 1, OSD_POOLRESEND) -DEFINE_CEPH_FEATURE(44, 1, ERASURE_CODE_PLUGINS_V2) +DEFINE_CEPH_FEATURE_DEPRECATED(44, 1, ERASURE_CODE_PLUGINS_V2, MIMIC) DEFINE_CEPH_FEATURE_RETIRED(45, 1, OSD_SET_ALLOC_HINT, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(46, 1, OSD_FADVISE_FLAGS) @@ -146,16 +145,15 @@ DEFINE_CEPH_FEATURE(48, 1, CRUSH_V4) 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(50, 1, MON_METADATA) -DEFINE_CEPH_FEATURE(51, 1, OSD_BITWISE_HOBJ_SORT) -DEFINE_CEPH_FEATURE(52, 1, OSD_PROXY_WRITE_FEATURES) -DEFINE_CEPH_FEATURE(53, 1, ERASURE_CODE_PLUGINS_V3) -DEFINE_CEPH_FEATURE(54, 1, OSD_HITSET_GMT) -DEFINE_CEPH_FEATURE(55, 1, HAMMER_0_94_4) +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(56, 1, NEW_OSDOP_ENCODING) DEFINE_CEPH_FEATURE(57, 1, MON_STATEFUL_SUB) -DEFINE_CEPH_FEATURE(57, 1, MON_ROUTE_OSDMAP) // overlap -DEFINE_CEPH_FEATURE(57, 1, OSDSUBOP_NO_SNAPCONTEXT) // overlap +DEFINE_CEPH_FEATURE_DEPRECATED(57, 1, MON_ROUTE_OSDMAP, MIMIC) // overlap DEFINE_CEPH_FEATURE(57, 1, SERVER_JEWEL) // overlap DEFINE_CEPH_FEATURE(58, 1, CRUSH_TUNABLES5) DEFINE_CEPH_FEATURE(58, 1, NEW_OSDOPREPLY_ENCODING) // overlap @@ -201,25 +199,25 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_CACHEPOOL | \ CEPH_FEATURE_CRUSH_V2 | \ CEPH_FEATURE_EXPORT_PEER | \ - CEPH_FEATURE_OSD_ERASURE_CODES | \ + DEPRECATED_CEPH_FEATURE_OSD_ERASURE_CODES | \ CEPH_FEATURE_OSDMAP_ENC | \ CEPH_FEATURE_MDS_INLINE_DATA | \ CEPH_FEATURE_CRUSH_TUNABLES3 | \ CEPH_FEATURE_OSD_PRIMARY_AFFINITY | \ CEPH_FEATURE_MSGR_KEEPALIVE2 | \ CEPH_FEATURE_OSD_POOLRESEND | \ - CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 | \ + DEPRECATED_CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 | \ CEPH_FEATURE_OSD_FADVISE_FLAGS | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ - CEPH_FEATURE_MON_METADATA | \ - CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT | \ - CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 | \ - CEPH_FEATURE_OSD_PROXY_WRITE_FEATURES | \ - CEPH_FEATURE_OSD_HITSET_GMT | \ - CEPH_FEATURE_HAMMER_0_94_4 | \ + 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 | \ - CEPH_FEATURE_MON_ROUTE_OSDMAP | \ + DEPRECATED_CEPH_FEATURE_MON_ROUTE_OSDMAP | \ CEPH_FEATURE_CRUSH_TUNABLES5 | \ CEPH_FEATURE_SERVER_JEWEL | \ CEPH_FEATURE_FS_FILE_LAYOUT_V2 | \ |