From 735af7c6fae5a4c4c664f6abf61f70c5d7ce801b Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Sat, 27 Aug 2016 11:33:02 -0700 Subject: [PATCH] osd/: 's/trim_rollback_to/roll_forward_to/g' trim_rollback_to was a not terrible name before in that all it ever did is (possibly) trim the stashed version of the object. However, now, it's going to encompass, in general, the roll_forward part of a tpc (which will still be to delete the stashed object in cases where that is appropriate). Signed-off-by: Samuel Just --- src/messages/MOSDRepOp.h | 6 +++--- src/messages/MOSDSubOp.h | 8 ++++---- src/osd/ECBackend.cc | 8 ++++---- src/osd/ECBackend.h | 4 ++-- src/osd/ECMsgTypes.cc | 12 ++++++------ src/osd/ECMsgTypes.h | 8 ++++---- src/osd/PG.cc | 10 +++++----- src/osd/PG.h | 2 +- src/osd/PGBackend.h | 4 ++-- src/osd/PGLog.h | 8 ++++---- src/osd/ReplicatedBackend.cc | 16 ++++++++-------- src/osd/ReplicatedBackend.h | 6 +++--- src/osd/ReplicatedPG.h | 4 ++-- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h index f80405a2676..e6acca66309 100644 --- a/src/messages/MOSDRepOp.h +++ b/src/messages/MOSDRepOp.h @@ -55,7 +55,7 @@ public: // piggybacked osd/og state eversion_t pg_trim_to; // primary->replica: trim to here - eversion_t pg_trim_rollback_to; // primary->replica: trim rollback + eversion_t pg_roll_forward_to; // primary->replica: trim rollback // info to here hobject_t new_temp_oid; ///< new temp object that we must now start tracking @@ -93,7 +93,7 @@ public: ::decode(from, p); ::decode(updated_hit_set_history, p); - ::decode(pg_trim_rollback_to, p); + ::decode(pg_roll_forward_to, p); final_decode_needed = false; } @@ -112,7 +112,7 @@ public: ::encode(discard_temp_oid, payload); ::encode(from, payload); ::encode(updated_hit_set_history, payload); - ::encode(pg_trim_rollback_to, payload); + ::encode(pg_roll_forward_to, payload); } MOSDRepOp() diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h index ae5465c3a9f..82b866dc803 100644 --- a/src/messages/MOSDSubOp.h +++ b/src/messages/MOSDSubOp.h @@ -63,7 +63,7 @@ public: // piggybacked osd/og state eversion_t pg_trim_to; // primary->replica: trim to here - eversion_t pg_trim_rollback_to; // primary->replica: trim rollback + eversion_t pg_roll_forward_to; // primary->replica: trim rollback // info to here osd_peer_stat_t peer_stat; @@ -172,9 +172,9 @@ public: ::decode(updated_hit_set_history, p); } if (header.version >= 11) { - ::decode(pg_trim_rollback_to, p); + ::decode(pg_roll_forward_to, p); } else { - pg_trim_rollback_to = pg_trim_to; + pg_roll_forward_to = pg_trim_to; } } @@ -234,7 +234,7 @@ public: ::encode(from, payload); ::encode(pgid.shard, payload); ::encode(updated_hit_set_history, payload); - ::encode(pg_trim_rollback_to, payload); + ::encode(pg_roll_forward_to, payload); } MOSDSubOp() diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 11b05a5e027..8d45d1fa1aa 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -875,7 +875,7 @@ void ECBackend::handle_sub_write( op.log_entries, op.updated_hit_set_history, op.trim_to, - op.trim_rollback_to, + op.roll_forward_to, !(op.t.empty()), localt); @@ -1338,7 +1338,7 @@ void ECBackend::submit_transaction( const eversion_t &at_version, PGTransactionUPtr &&_t, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, const vector &log_entries, boost::optional &hset_history, Context *on_local_applied_sync, @@ -1354,7 +1354,7 @@ void ECBackend::submit_transaction( op->hoid = hoid; op->version = at_version; op->trim_to = trim_to; - op->trim_rollback_to = trim_rollback_to; + op->roll_forward_to = roll_forward_to; op->log_entries = log_entries; std::swap(op->updated_hit_set_history, hset_history); op->on_local_applied_sync = on_local_applied_sync; @@ -1788,7 +1788,7 @@ void ECBackend::start_write(Op *op) { should_send ? iter->second : empty, op->version, op->trim_to, - op->trim_rollback_to, + op->roll_forward_to, op->log_entries, op->updated_hit_set_history, op->temp_added, diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h index 0612431ac39..5d7513abf8a 100644 --- a/src/osd/ECBackend.h +++ b/src/osd/ECBackend.h @@ -93,7 +93,7 @@ public: const eversion_t &at_version, PGTransactionUPtr &&t, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, const vector &log_entries, boost::optional &hset_history, Context *on_local_applied_sync, @@ -344,7 +344,7 @@ public: hobject_t hoid; eversion_t version; eversion_t trim_to; - eversion_t trim_rollback_to; + eversion_t roll_forward_to; vector log_entries; map obc_map; boost::optional updated_hit_set_history; diff --git a/src/osd/ECMsgTypes.cc b/src/osd/ECMsgTypes.cc index 0dc65b03081..a914f9f07c0 100644 --- a/src/osd/ECMsgTypes.cc +++ b/src/osd/ECMsgTypes.cc @@ -29,7 +29,7 @@ void ECSubWrite::encode(bufferlist &bl) const ::encode(temp_added, bl); ::encode(temp_removed, bl); ::encode(updated_hit_set_history, bl); - ::encode(trim_rollback_to, bl); + ::encode(roll_forward_to, bl); ENCODE_FINISH(bl); } @@ -51,9 +51,9 @@ void ECSubWrite::decode(bufferlist::iterator &bl) ::decode(updated_hit_set_history, bl); } if (struct_v >= 3) { - ::decode(trim_rollback_to, bl); + ::decode(roll_forward_to, bl); } else { - trim_rollback_to = trim_to; + roll_forward_to = trim_to; } DECODE_FINISH(bl); } @@ -65,7 +65,7 @@ std::ostream &operator<<( << ", reqid=" << rhs.reqid << ", at_version=" << rhs.at_version << ", trim_to=" << rhs.trim_to - << ", trim_rollback_to=" << rhs.trim_rollback_to; + << ", roll_forward_to=" << rhs.roll_forward_to; if (rhs.updated_hit_set_history) lhs << ", has_updated_hit_set_history"; return lhs << ")"; @@ -77,7 +77,7 @@ void ECSubWrite::dump(Formatter *f) const f->dump_stream("reqid") << reqid; f->dump_stream("at_version") << at_version; f->dump_stream("trim_to") << trim_to; - f->dump_stream("trim_rollback_to") << trim_rollback_to; + f->dump_stream("roll_forward_to") << roll_forward_to; f->dump_bool("has_updated_hit_set_history", static_cast(updated_hit_set_history)); } @@ -98,7 +98,7 @@ void ECSubWrite::generate_test_instances(list &o) o.back()->reqid = osd_reqid_t(entity_name_t::CLIENT(123), 1, 45678); o.back()->at_version = eversion_t(10, 300); o.back()->trim_to = eversion_t(5, 42); - o.back()->trim_rollback_to = eversion_t(8, 250); + o.back()->roll_forward_to = eversion_t(8, 250); } void ECSubWriteReply::encode(bufferlist &bl) const diff --git a/src/osd/ECMsgTypes.h b/src/osd/ECMsgTypes.h index cc41c5a338c..80ea35d9e4d 100644 --- a/src/osd/ECMsgTypes.h +++ b/src/osd/ECMsgTypes.h @@ -29,7 +29,7 @@ struct ECSubWrite { ObjectStore::Transaction t; eversion_t at_version; eversion_t trim_to; - eversion_t trim_rollback_to; + eversion_t roll_forward_to; vector log_entries; set temp_added; set temp_removed; @@ -44,7 +44,7 @@ struct ECSubWrite { const ObjectStore::Transaction &t, eversion_t at_version, eversion_t trim_to, - eversion_t trim_rollback_to, + eversion_t roll_forward_to, vector log_entries, boost::optional updated_hit_set_history, const set &temp_added, @@ -52,7 +52,7 @@ struct ECSubWrite { : from(from), tid(tid), reqid(reqid), soid(soid), stats(stats), t(t), at_version(at_version), - trim_to(trim_to), trim_rollback_to(trim_rollback_to), + trim_to(trim_to), roll_forward_to(roll_forward_to), log_entries(log_entries), temp_added(temp_added), temp_removed(temp_removed), @@ -66,7 +66,7 @@ struct ECSubWrite { t.swap(other.t); at_version = other.at_version; trim_to = other.trim_to; - trim_rollback_to = other.trim_rollback_to; + roll_forward_to = other.roll_forward_to; log_entries.swap(other.log_entries); temp_added.swap(other.temp_added); temp_removed.swap(other.temp_removed); diff --git a/src/osd/PG.cc b/src/osd/PG.cc index d115e5c5c21..660dae066af 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3031,7 +3031,7 @@ void PG::add_log_entry(const pg_log_entry_t& e) void PG::append_log( const vector& logv, eversion_t trim_to, - eversion_t trim_rollback_to, + eversion_t roll_forward_to, ObjectStore::Transaction &t, bool transaction_applied) { @@ -3062,20 +3062,20 @@ void PG::append_log( this, get_osdmap()->get_epoch(), info.last_update)); - } else if (trim_rollback_to > pg_log.get_rollback_trimmed_to()) { + } else if (roll_forward_to > pg_log.get_rollback_trimmed_to()) { pg_log.trim_rollback_info( - trim_rollback_to, + roll_forward_to, &handler); t.register_on_applied( new C_UpdateLastRollbackInfoTrimmedToApplied( this, get_osdmap()->get_epoch(), - trim_rollback_to)); + roll_forward_to)); } pg_log.trim(&handler, trim_to, info); - dout(10) << __func__ << ": trimming to " << trim_rollback_to + dout(10) << __func__ << ": trimming to " << roll_forward_to << " entries " << handler.to_trim << dendl; handler.apply(this, &t); diff --git a/src/osd/PG.h b/src/osd/PG.h index f5d95f7733b..80133717a2f 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -2263,7 +2263,7 @@ public: void append_log( const vector& logv, eversion_t trim_to, - eversion_t trim_rollback_to, + eversion_t roll_forward_to, ObjectStore::Transaction &t, bool transaction_applied = true); bool check_log_for_corruption(ObjectStore *store); diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h index 6ff831ab273..7f7a4481a2c 100644 --- a/src/osd/PGBackend.h +++ b/src/osd/PGBackend.h @@ -192,7 +192,7 @@ typedef ceph::shared_ptr OSDMapRef; const vector &logv, boost::optional &hset_history, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, bool transaction_applied, ObjectStore::Transaction &t) = 0; @@ -374,7 +374,7 @@ typedef ceph::shared_ptr OSDMapRef; const eversion_t &at_version, ///< [in] version PGTransactionUPtr &&t, ///< [in] trans to execute (move) const eversion_t &trim_to, ///< [in] trim log to here - const eversion_t &trim_rollback_to, ///< [in] trim rollback info to here + const eversion_t &roll_forward_to, ///< [in] trim rollback info to here const vector &log_entries, ///< [in] log entries for t /// [in] hitset history (if updated with this transaction) boost::optional &hset_history, diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index ecf340fc75b..25b4412d321 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -569,12 +569,12 @@ public: pg_info_t &info); void trim_rollback_info( - eversion_t trim_rollback_to, + eversion_t roll_forward_to, LogEntryHandler *h) { - if (trim_rollback_to > log.can_rollback_to) - log.can_rollback_to = trim_rollback_to; + if (roll_forward_to > log.can_rollback_to) + log.can_rollback_to = roll_forward_to; log.advance_rollback_info_trimmed_to( - trim_rollback_to, + roll_forward_to, h); } diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index c3a02b0cce1..314683bfef9 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -523,7 +523,7 @@ void ReplicatedBackend::submit_transaction( const eversion_t &at_version, PGTransactionUPtr &&_t, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, const vector &_log_entries, boost::optional &hset_history, Context *on_local_applied_sync, @@ -570,7 +570,7 @@ void ReplicatedBackend::submit_transaction( tid, reqid, trim_to, - trim_rollback_to, + roll_forward_to, added.size() ? *(added.begin()) : hobject_t(), removed.size() ? *(removed.begin()) : hobject_t(), log_entries, @@ -585,7 +585,7 @@ void ReplicatedBackend::submit_transaction( log_entries, hset_history, trim_to, - trim_rollback_to, + roll_forward_to, true, op_t); @@ -968,7 +968,7 @@ Message * ReplicatedBackend::generate_subop( ceph_tid_t tid, osd_reqid_t reqid, eversion_t pg_trim_to, - eversion_t pg_trim_rollback_to, + eversion_t pg_roll_forward_to, hobject_t new_temp_oid, hobject_t discard_temp_oid, const vector &log_entries, @@ -1008,7 +1008,7 @@ Message * ReplicatedBackend::generate_subop( wr->pg_stats = get_info().stats; wr->pg_trim_to = pg_trim_to; - wr->pg_trim_rollback_to = pg_trim_rollback_to; + wr->pg_roll_forward_to = pg_roll_forward_to; wr->new_temp_oid = new_temp_oid; wr->discard_temp_oid = discard_temp_oid; @@ -1022,7 +1022,7 @@ void ReplicatedBackend::issue_op( ceph_tid_t tid, osd_reqid_t reqid, eversion_t pg_trim_to, - eversion_t pg_trim_rollback_to, + eversion_t pg_roll_forward_to, hobject_t new_temp_oid, hobject_t discard_temp_oid, const vector &log_entries, @@ -1054,7 +1054,7 @@ void ReplicatedBackend::issue_op( tid, reqid, pg_trim_to, - pg_trim_rollback_to, + pg_roll_forward_to, new_temp_oid, discard_temp_oid, log_entries, @@ -1139,7 +1139,7 @@ void ReplicatedBackend::sub_op_modify(OpRequestRef op) log, m->updated_hit_set_history, m->pg_trim_to, - m->pg_trim_rollback_to, + m->pg_roll_forward_to, update_snaps, rm->localt); diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 9ad29e4e3ed..65a4c55d688 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -347,7 +347,7 @@ public: const eversion_t &at_version, PGTransactionUPtr &&t, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, const vector &log_entries, boost::optional &hset_history, Context *on_local_applied_sync, @@ -365,7 +365,7 @@ private: ceph_tid_t tid, osd_reqid_t reqid, eversion_t pg_trim_to, - eversion_t pg_trim_rollback_to, + eversion_t pg_roll_forward_to, hobject_t new_temp_oid, hobject_t discard_temp_oid, const vector &log_entries, @@ -379,7 +379,7 @@ private: ceph_tid_t tid, osd_reqid_t reqid, eversion_t pg_trim_to, - eversion_t pg_trim_rollback_to, + eversion_t pg_roll_forward_to, hobject_t new_temp_oid, hobject_t discard_temp_oid, const vector &log_entries, diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 47e3535deb3..ad3ece3a74a 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -342,14 +342,14 @@ public: const vector &logv, boost::optional &hset_history, const eversion_t &trim_to, - const eversion_t &trim_rollback_to, + const eversion_t &roll_forward_to, bool transaction_applied, ObjectStore::Transaction &t) override { if (hset_history) { info.hit_set = *hset_history; dirty_info = true; } - append_log(logv, trim_to, trim_rollback_to, t, transaction_applied); + append_log(logv, trim_to, roll_forward_to, t, transaction_applied); } struct C_OSD_OnApplied; -- 2.39.5