From 5b3cfc0890d36d8b2b8ef6742e71f6afb4aef444 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Jun 2017 16:49:11 -0400 Subject: [PATCH] osd: move pglog to osd_pglog mempool This actually everything in the osd mempool, so it's basically a rename. Signed-off-by: Sage Weil --- src/include/mempool.h | 1 + src/messages/MOSDPGUpdateLogMissing.h | 4 ++-- src/osd/PG.cc | 4 ++-- src/osd/PG.h | 4 ++-- src/osd/PGLog.cc | 2 +- src/osd/PGLog.h | 24 ++++++++++++------------ src/osd/PrimaryLogPG.cc | 6 +++--- src/osd/PrimaryLogPG.h | 2 +- src/osd/osd_types.h | 12 ++++++------ 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/include/mempool.h b/src/include/mempool.h index 6ae5740c2caf2..b0f29baa00bcc 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -150,6 +150,7 @@ namespace mempool { f(buffer_meta) \ f(osd) \ f(osd_mapbl) \ + f(osd_pglog) \ f(osdmap) \ f(osdmap_mapping) \ f(pgmap) \ diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h index facb65bc854fd..7823fd08f7343 100644 --- a/src/messages/MOSDPGUpdateLogMissing.h +++ b/src/messages/MOSDPGUpdateLogMissing.h @@ -29,7 +29,7 @@ public: spg_t pgid; shard_id_t from; ceph_tid_t rep_tid; - mempool::osd::list entries; + mempool::osd_pglog::list entries; epoch_t get_epoch() const { return map_epoch; } spg_t get_pgid() const { return pgid; } @@ -50,7 +50,7 @@ public: : MOSDFastDispatchOp(MSG_OSD_PG_UPDATE_LOG_MISSING, HEAD_VERSION, COMPAT_VERSION) { } MOSDPGUpdateLogMissing( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, spg_t pgid, shard_id_t from, epoch_t epoch, diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 994cb9095ff26..c186548a6c69b 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4928,7 +4928,7 @@ void PG::share_pg_info() } bool PG::append_log_entries_update_missing( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObjectStore::Transaction &t) { assert(!entries.empty()); @@ -4955,7 +4955,7 @@ bool PG::append_log_entries_update_missing( void PG::merge_new_log_entries( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObjectStore::Transaction &t) { dout(10) << __func__ << " " << entries << dendl; diff --git a/src/osd/PG.h b/src/osd/PG.h index c452fbb0c9539..f40b9aa4df225 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -2382,7 +2382,7 @@ public: bool append_log_entries_update_missing( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObjectStore::Transaction &t); /** @@ -2390,7 +2390,7 @@ public: * actingbackfill logs and missings (also missing_loc) */ void merge_new_log_entries( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObjectStore::Transaction &t); void reset_interval_flush(); diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index 63e1cdfc02629..e85c6cc3333a3 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -368,7 +368,7 @@ void PGLog::merge_log(pg_info_t &oinfo, pg_log_t &olog, pg_shard_t fromosd, } log.roll_forward_to(log.head, rollbacker); - mempool::osd::list new_entries; + mempool::osd_pglog::list new_entries; new_entries.splice(new_entries.end(), olog.log, from, to); append_log_entries_update_missing( info.last_backfill, diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index d4dfc450a42bf..490bd28797a2b 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -97,7 +97,7 @@ public: * It's a reverse_iterator because rend() is a natural representation for * tail, and rbegin() works nicely for head. */ - mempool::osd::list::reverse_iterator + mempool::osd_pglog::list::reverse_iterator rollback_info_trimmed_to_riter; template @@ -179,7 +179,7 @@ public: advance_can_rollback_to(head, [&](const pg_log_entry_t &entry) {}); } - mempool::osd::list rewind_from_head(eversion_t newhead) { + mempool::osd_pglog::list rewind_from_head(eversion_t newhead) { auto divergent = pg_log_t::rewind_from_head(newhead); index(); reset_rollback_info_trimmed_to_riter(); @@ -712,10 +712,10 @@ public: protected: static void split_by_object( - mempool::osd::list &entries, - map> *out_entries) { + mempool::osd_pglog::list &entries, + map> *out_entries) { while (!entries.empty()) { - mempool::osd::list &out_list = (*out_entries)[entries.front().soid]; + auto &out_list = (*out_entries)[entries.front().soid]; out_list.splice(out_list.end(), entries, entries.begin()); } } @@ -744,7 +744,7 @@ protected: static void _merge_object_divergent_entries( const IndexedLog &log, ///< [in] log to merge against const hobject_t &hoid, ///< [in] object we are merging - const mempool::osd::list &entries, ///< [in] entries for hoid to merge + const mempool::osd_pglog::list &entries, ///< [in] entries for hoid to merge const pg_info_t &info, ///< [in] info for merging entries eversion_t olog_can_rollback_to, ///< [in] rollback boundary missing_type &missing, ///< [in,out] missing to adjust, use @@ -926,16 +926,16 @@ protected: template static void _merge_divergent_entries( const IndexedLog &log, ///< [in] log to merge against - mempool::osd::list &entries, ///< [in] entries to merge + mempool::osd_pglog::list &entries, ///< [in] entries to merge const pg_info_t &oinfo, ///< [in] info for merging entries eversion_t olog_can_rollback_to, ///< [in] rollback boundary missing_type &omissing, ///< [in,out] missing to adjust, use LogEntryHandler *rollbacker, ///< [in] optional rollbacker object const DoutPrefixProvider *dpp ///< [in] logging provider ) { - map > split; + map > split; split_by_object(entries, &split); - for (map>::iterator i = split.begin(); + for (map>::iterator i = split.begin(); i != split.end(); ++i) { _merge_object_divergent_entries( @@ -959,7 +959,7 @@ protected: const pg_log_entry_t& oe, const pg_info_t& info, LogEntryHandler *rollbacker) { - mempool::osd::list entries; + mempool::osd_pglog::list entries; entries.push_back(oe); _merge_object_divergent_entries( log, @@ -988,7 +988,7 @@ public: static bool append_log_entries_update_missing( const hobject_t &last_backfill, bool last_backfill_bitwise, - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, bool maintain_rollback, IndexedLog *log, missing_type &missing, @@ -1024,7 +1024,7 @@ public: bool append_new_log_entries( const hobject_t &last_backfill, bool last_backfill_bitwise, - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, LogEntryHandler *rollbacker) { bool invalidate_stats = append_log_entries_update_missing( last_backfill, diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 87616ae48a706..a097782ab5bad 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -2358,7 +2358,7 @@ void PrimaryLogPG::record_write_error(OpRequestRef op, const hobject_t &soid, assert(op->may_write()); const osd_reqid_t &reqid = static_cast(op->get_req())->get_reqid(); ObjectContextRef obc; - mempool::osd::list entries; + mempool::osd_pglog::list entries; entries.push_back(pg_log_entry_t(pg_log_entry_t::ERROR, soid, get_next_version(), eversion_t(), 0, reqid, utime_t(), r)); @@ -9212,7 +9212,7 @@ void PrimaryLogPG::simple_opc_submit(OpContextUPtr ctx) void PrimaryLogPG::submit_log_entries( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObcLockManager &&manager, boost::optional > &&_on_complete, OpRequestRef op, @@ -10382,7 +10382,7 @@ void PrimaryLogPG::mark_all_unfound_lost( pg_log.get_log().print(*_dout); *_dout << dendl; - mempool::osd::list log_entries; + mempool::osd_pglog::list log_entries; utime_t mtime = ceph_clock_now(); map::const_iterator m = diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index cb2127bc76055..16ea3922079fa 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -864,7 +864,7 @@ protected: * Also used to store error log entries for dup detection. */ void submit_log_entries( - const mempool::osd::list &entries, + const mempool::osd_pglog::list &entries, ObcLockManager &&manager, boost::optional > &&on_complete, OpRequestRef op = OpRequestRef(), diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 4c4f98c705e00..2dfe6d5592e3a 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -3412,14 +3412,14 @@ protected: eversion_t rollback_info_trimmed_to; public: - mempool::osd::list log; // the actual log. + mempool::osd_pglog::list log; // the actual log. pg_log_t() = default; pg_log_t(const eversion_t &last_update, const eversion_t &log_tail, const eversion_t &can_rollback_to, const eversion_t &rollback_info_trimmed_to, - mempool::osd::list &&entries) + mempool::osd_pglog::list &&entries) : head(last_update), tail(log_tail), can_rollback_to(can_rollback_to), rollback_info_trimmed_to(rollback_info_trimmed_to), log(std::move(entries)) {} @@ -3450,7 +3450,7 @@ public: pg_log_t split_out_child(pg_t child_pgid, unsigned split_bits) { - mempool::osd::list oldlog, childlog; + mempool::osd_pglog::list oldlog, childlog; oldlog.swap(log); eversion_t old_tail; @@ -3474,11 +3474,11 @@ public: std::move(childlog)); } - mempool::osd::list rewind_from_head(eversion_t newhead) { + mempool::osd_pglog::list rewind_from_head(eversion_t newhead) { assert(newhead >= tail); - mempool::osd::list::iterator p = log.end(); - mempool::osd::list divergent; + mempool::osd_pglog::list::iterator p = log.end(); + mempool::osd_pglog::list divergent; while (true) { if (p == log.begin()) { // yikes, the whole thing is divergent! -- 2.39.5