From b0ba592986ff8fe05205fd8afd970dc79a4187c8 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 14 Mar 2016 15:42:25 -0700 Subject: [PATCH] features: deprecate CEPH_FEATURE_OSD_SET_ALLOC_HINT Signed-off-by: Samuel Just --- src/include/ceph_features.h | 4 ++-- src/osd/ReplicatedPG.cc | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index b05e24f52436c..b8cce878a91e2 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -59,7 +59,7 @@ #define CEPH_FEATURE_MSGR_KEEPALIVE2 (1ULL<<42) #define CEPH_FEATURE_OSD_POOLRESEND (1ULL<<43) #define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 (1ULL<<44) -#define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45) +#define DEPRECATED_CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45) // DEPRECATED: JEWEL #define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46) #define CEPH_FEATURE_OSD_REPOP (1ULL<<46) /* overlap with fadvise */ #define CEPH_FEATURE_OSD_OBJECT_DIGEST (1ULL<<46) /* overlap with fadvise */ @@ -160,7 +160,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_MSGR_KEEPALIVE2 | \ CEPH_FEATURE_OSD_POOLRESEND | \ CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 | \ - CEPH_FEATURE_OSD_SET_ALLOC_HINT | \ + DEPRECATED_CEPH_FEATURE_OSD_SET_ALLOC_HINT | \ CEPH_FEATURE_OSD_FADVISE_FLAGS | \ CEPH_FEATURE_OSD_REPOP | \ CEPH_FEATURE_OSD_OBJECT_DIGEST | \ diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index d2fd6e9c6874e..5631fe64e1625 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4879,10 +4879,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) ++ctx->num_write; { tracepoint(osd, do_osd_op_pre_setallochint, soid.oid.name.c_str(), soid.snap.val, op.alloc_hint.expected_object_size, op.alloc_hint.expected_write_size); - if (!(get_min_upacting_features() & CEPH_FEATURE_OSD_SET_ALLOC_HINT)) { - result = -EOPNOTSUPP; - break; - } if (maybe_create_new_object(ctx)) { ctx->mod_desc.create(); t->touch(soid); -- 2.39.5