From: Samuel Just Date: Mon, 14 Mar 2016 22:35:48 +0000 (-0700) Subject: features: deprecate CEPH_OSD_FEATURE_SNAPMAPPER X-Git-Tag: v10.1.0~17^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9326c2b4abf8acf698c3e2e43cd1ccac455d3bf3;p=ceph.git features: deprecate CEPH_OSD_FEATURE_SNAPMAPPER Signed-off-by: Samuel Just --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 29bf5e014195..38ed999cb688 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -494,7 +494,6 @@ int main(int argc, const char **argv) CEPH_FEATURE_UID | CEPH_FEATURE_PGID64 | CEPH_FEATURE_OSDENC | - CEPH_FEATURE_OSD_SNAPMAPPER | CEPH_FEATURE_OSD_PACKED_RECOVERY; ms_public->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 6b132ede0252..a22a49b5acce 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -42,7 +42,7 @@ #define CEPH_FEATURE_MDSENC (1ULL<<29) #define CEPH_FEATURE_OSDHASHPSPOOL (1ULL<<30) #define CEPH_FEATURE_MON_SINGLE_PAXOS (1ULL<<31) -#define CEPH_FEATURE_OSD_SNAPMAPPER (1ULL<<32) +#define DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER (1ULL<<32) // DEPRECATED: JEWEL #define CEPH_FEATURE_MON_SCRUB (1ULL<<33) #define CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<34) #define CEPH_FEATURE_OSD_CACHEPOOL (1ULL<<35) @@ -146,7 +146,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_NEW_OSDOP_ENCODING | \ CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \ CEPH_FEATURE_MON_SINGLE_PAXOS | \ - CEPH_FEATURE_OSD_SNAPMAPPER | \ + DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER | \ CEPH_FEATURE_MON_SCRUB | \ CEPH_FEATURE_OSD_PACKED_RECOVERY | \ CEPH_FEATURE_OSD_CACHEPOOL | \