From: Josh Durgin Date: Fri, 30 Jun 2017 00:12:39 +0000 (-0400) Subject: include/ceph_features.h: add feature bit for handling deletes during recovery X-Git-Tag: v12.1.2~220^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2525609b30d21adf38b6fe2b27873b97d762b98b;p=ceph.git include/ceph_features.h: add feature bit for handling deletes during recovery The BLKIN feature bit was actually unused - it was a remnant from earlier versions of the blkin work, but all the encoding is handled by struct-level versioning in the version that merged. Use bit 60 (unused in any prior version) so that recovery deletes could potentially be backported. Signed-off-by: Josh Durgin --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 9decdaff3e70..908d65ddc7f9 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -162,22 +162,13 @@ DEFINE_CEPH_FEATURE(58, 1, FS_FILE_LAYOUT_V2) // overlap DEFINE_CEPH_FEATURE(59, 1, FS_BTIME) DEFINE_CEPH_FEATURE(59, 1, FS_CHANGE_ATTR) // overlap DEFINE_CEPH_FEATURE(59, 1, MSG_ADDR2) // overlap -DEFINE_CEPH_FEATURE(60, 1, BLKIN_TRACING) // *do not share this bit* +DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit* DEFINE_CEPH_FEATURE(61, 1, RESERVED2) // unused, but slow down! DEFINE_CEPH_FEATURE(62, 1, RESERVED) // do not use; used as a sentinal DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facing -/* - * conditionally include blkin in CEPH_FEATURES_ALL/SUPPORTED_DEFAULT - */ -#ifdef WITH_BLKIN -#define CEPH_FEATURES_BLKIN CEPH_FEATURE_BLKIN_TRACING -#else -#define CEPH_FEATURES_BLKIN 0 -#endif - /* * Features supported. Should be everything above. */ @@ -238,7 +229,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_SERVER_LUMINOUS | \ CEPH_FEATURE_RESEND_ON_SPLIT | \ CEPH_FEATURE_RADOS_BACKOFF | \ - CEPH_FEATURES_BLKIN | \ + CEPH_FEATURE_OSD_RECOVERY_DELETES | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL