From: Greg Farnum Date: Tue, 15 Sep 2020 02:24:20 +0000 (+0000) Subject: features: change STRETCH_MODE feature to avoid a conflict X-Git-Tag: v16.1.0~1053^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4375d1d0229076c2cabdc75fc3a4d7db84e989a;p=ceph.git features: change STRETCH_MODE feature to avoid a conflict Signed-off-by: Greg Farnum --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index df2d6e1e47d2..54bd3629cb26 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -115,7 +115,6 @@ DEFINE_CEPH_FEATURE(21, 2, RADOS_BACKOFF) // overlap DEFINE_CEPH_FEATURE(21, 2, OSDMAP_PG_UPMAP) // overlap DEFINE_CEPH_FEATURE(21, 2, CRUSH_CHOOSE_ARGS) // overlap DEFINE_CEPH_FEATURE_RETIRED(22, 1, BACKFILL_RESERVATION, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE(22, 3, STRETCH_MODE) DEFINE_CEPH_FEATURE(23, 1, MSG_AUTH) // 3.19 req (unless nocephx_require_signatures) DEFINE_CEPH_FEATURE_RETIRED(24, 1, RECOVERY_RESERVATION, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(24, 2, RECOVERY_RESERVATION_2) @@ -128,7 +127,7 @@ DEFINE_CEPH_FEATURE(29, 1, MDSENC) // 4.7 DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL) // 3.9 DEFINE_CEPH_FEATURE_DEPRECATED(31, 1, MON_SINGLE_PAXOS, NAUTILUS) DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS) -// available +DEFINE_CEPH_FEATURE(32, 3, STRETCH_MODE) DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS) // available DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS)