From d2eb10111a9acdf9930073d4f9096b29b452cc27 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 14 Mar 2016 16:00:52 -0700 Subject: [PATCH] features: deprecate CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT We can't remove this until the other 1<<46's also go. Signed-off-by: Samuel Just --- src/include/ceph_features.h | 4 ++-- src/osd/ECBackend.cc | 3 --- src/osd/PGBackend.h | 1 - src/osd/ReplicatedBackend.cc | 10 +++------- src/osd/ReplicatedPG.h | 5 ----- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index fa0c91c5dc801..a5f2b96257cf7 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -63,7 +63,7 @@ #define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46) #define DEPRECATED_CEPH_FEATURE_OSD_REPOP (1ULL<<46) // DEPRECATED: JEWEL (can't remove until all 1<<46 are ready) #define DEPRECATED_CEPH_FEATURE_OSD_OBJECT_DIGEST (1ULL<<46) // DEPRECATED: JEWEL (can't remove until all 1<<46 are ready) -#define CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT (1ULL<<46) /* overlap w/ fadvise */ +#define DEPRECATED_CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT (1ULL<<46) // DEPRECATED: JEWEL (can't remove until all 1<<46 are ready) #define CEPH_FEATURE_MDS_QUOTA (1ULL<<47) #define CEPH_FEATURE_CRUSH_V4 (1ULL<<48) /* straw2 buckets */ #define CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY (1ULL<<49) @@ -164,7 +164,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_OSD_FADVISE_FLAGS | \ DEPRECATED_CEPH_FEATURE_OSD_REPOP | \ DEPRECATED_CEPH_FEATURE_OSD_OBJECT_DIGEST | \ - CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT | \ + DEPRECATED_CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY | \ diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index ff44a69304558..975c49b8d90bf 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -835,7 +835,6 @@ void ECBackend::handle_sub_write( if (!get_parent()->pgb_is_primary()) get_parent()->update_stats(op.stats); ObjectStore::Transaction localt; - localt.set_use_tbl(op.t.get_use_tbl()); if (!op.temp_added.empty()) { add_temp_objs(op.temp_added); } @@ -1778,10 +1777,8 @@ void ECBackend::start_write(Op *op) { i != get_parent()->get_actingbackfill_shards().end(); ++i) { trans[i->shard]; - trans[i->shard].set_use_tbl(parent->transaction_use_tbl()); } ObjectStore::Transaction empty; - empty.set_use_tbl(parent->transaction_use_tbl()); op->t->generate_transactions( op->unstable_hash_infos, diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h index 48ff1d9156fb8..f88c1a08af764 100644 --- a/src/osd/PGBackend.h +++ b/src/osd/PGBackend.h @@ -215,7 +215,6 @@ struct shard_info_wrapper; virtual uint64_t min_peer_features() const = 0; virtual bool sort_bitwise() const = 0; - virtual bool transaction_use_tbl() = 0; virtual hobject_t get_temp_recovery_object(eversion_t version, snapid_t snap) = 0; diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 9d99356b6cb68..5c6d5e834bcd2 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -328,10 +328,8 @@ class RPGTransaction : public PGBackend::PGTransaction { return coll; } public: - RPGTransaction(coll_t coll, bool use_tbl) - : coll(coll), written(0) { - t.set_use_tbl(use_tbl); - } + RPGTransaction(coll_t coll) + : coll(coll), written(0) {} /// Yields ownership of contained transaction ObjectStore::Transaction&& get_transaction() { @@ -517,7 +515,7 @@ public: PGBackend::PGTransaction *ReplicatedBackend::get_transaction() { - return new RPGTransaction(coll, parent->transaction_use_tbl()); + return new RPGTransaction(coll); } class C_OSD_OnOpCommit : public Context { @@ -1009,7 +1007,6 @@ Message * ReplicatedBackend::generate_subop( << ", pinfo.last_backfill " << pinfo.last_backfill << ")" << dendl; ObjectStore::Transaction t; - t.set_use_tbl(op_t.get_use_tbl()); ::encode(t, wr->get_data()); } else { ::encode(op_t, wr->get_data()); @@ -1123,7 +1120,6 @@ void ReplicatedBackend::sub_op_modify(OpRequestRef op) bufferlist::iterator p = m->get_data().begin(); ::decode(rm->opt, p); - rm->localt.set_use_tbl(rm->opt.get_use_tbl()); if (m->new_temp_oid != hobject_t()) { dout(20) << __func__ << " start tracking temp " << m->new_temp_oid << dendl; diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 3d24617e8d9b7..5384f2dd200a3 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -451,11 +451,6 @@ public: return get_sort_bitwise(); } - bool transaction_use_tbl() { - uint64_t min_features = get_min_upacting_features(); - return !(min_features & CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT); - } - void send_message_osd_cluster( int peer, Message *m, epoch_t from_epoch); void send_message_osd_cluster( -- 2.39.5