From 85887a7a0a40d338ce537d3323d914bcb90cec91 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Jun 2017 21:57:04 -0400 Subject: [PATCH] osd/osd_types: put pg_log_entry_t::extra_reqids in osd_pglog mempool Signed-off-by: Sage Weil --- src/osd/PGLog.h | 17 ++++++----------- src/osd/PrimaryLogPG.h | 4 ++-- src/osd/osd_types.cc | 5 ++--- src/osd/osd_types.h | 4 ++-- src/osdc/Objecter.h | 6 +++--- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 490bd28797a2b..176a682b6a4e8 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -284,8 +284,7 @@ public: } p = extra_caller_ops.find(r); if (p != extra_caller_ops.end()) { - for (vector >::const_iterator i = - p->second->extra_reqids.begin(); + for (auto i = p->second->extra_reqids.begin(); i != p->second->extra_reqids.end(); ++i) { if (i->first == r) { @@ -302,7 +301,7 @@ public: /// get a (bounded) list of recent reqids for the given object void get_object_reqids(const hobject_t& oid, unsigned max, - vector > *pls) const { + mempool::osd_pglog::vector > *pls) const { // make sure object is present at least once before we do an // O(n) search. if (!(indexed_data & PGLOG_INDEXED_OBJECTS)) { @@ -351,8 +350,7 @@ public: } if (to_index & PGLOG_INDEXED_EXTRA_CALLER_OPS) { - for (vector >::const_iterator j = - i->extra_reqids.begin(); + for (auto j = i->extra_reqids.begin(); j != i->extra_reqids.end(); ++j) { extra_caller_ops.insert( @@ -389,8 +387,7 @@ public: } } if (indexed_data & PGLOG_INDEXED_EXTRA_CALLER_OPS) { - for (vector >::const_iterator j = - e.extra_reqids.begin(); + for (auto j = e.extra_reqids.begin(); j != e.extra_reqids.end(); ++j) { extra_caller_ops.insert(make_pair(j->first, &e)); @@ -417,8 +414,7 @@ public: } } if (indexed_data & PGLOG_INDEXED_EXTRA_CALLER_OPS) { - for (vector >::const_iterator j = - e.extra_reqids.begin(); + for (auto j = e.extra_reqids.begin(); j != e.extra_reqids.end(); ++j) { for (ceph::unordered_multimap::iterator k = @@ -465,8 +461,7 @@ public: } if (indexed_data & PGLOG_INDEXED_EXTRA_CALLER_OPS) { - for (vector >::const_iterator j = - e.extra_reqids.begin(); + for (auto j = e.extra_reqids.begin(); j != e.extra_reqids.end(); ++j) { extra_caller_ops.insert(make_pair(j->first, &(log.back()))); diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index 16ea3922079fa..f6c1b97d8a361 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -91,7 +91,7 @@ public: uint32_t flags; // object_copy_data_t::FLAG_* uint32_t source_data_digest, source_omap_digest; uint32_t data_digest, omap_digest; - vector > reqids; // [(reqid, user_version)] + mempool::osd_pglog::vector > reqids; // [(reqid, user_version)] map attrs; // xattrs uint64_t truncate_seq; uint64_t truncate_size; @@ -530,7 +530,7 @@ public: int num_read; ///< count read ops int num_write; ///< count update ops - vector > extra_reqids; + mempool::osd_pglog::vector > extra_reqids; CopyFromCallback *copy_cb; diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 7f450005c5bdf..dcfe790567ffd 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -4009,8 +4009,7 @@ void pg_log_entry_t::dump(Formatter *f) const f->dump_stream("prior_version") << prior_version; f->dump_stream("reqid") << reqid; f->open_array_section("extra_reqids"); - for (vector >::const_iterator p = - extra_reqids.begin(); + for (auto p = extra_reqids.begin(); p != extra_reqids.end(); ++p) { f->open_object_section("extra_reqid"); @@ -4444,7 +4443,7 @@ void object_copy_data_t::dump(Formatter *f) const f->dump_unsigned("snap", *p); f->close_section(); f->open_array_section("reqids"); - for (vector >::const_iterator p = reqids.begin(); + for (auto p = reqids.begin(); p != reqids.end(); ++p) { f->open_object_section("extra_reqid"); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index cc00d2a75d163..3e2128e414ed8 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -3307,7 +3307,7 @@ struct pg_log_entry_t { bufferlist snaps; // only for clone entries hobject_t soid; osd_reqid_t reqid; // caller+tid to uniquely identify request - vector > extra_reqids; + mempool::osd_pglog::vector > extra_reqids; eversion_t version, prior_version, reverting_to; version_t user_version; // the user version for this entry utime_t mtime; // this is the _user_ mtime, mind you @@ -4157,7 +4157,7 @@ struct object_copy_data_t { snapid_t snap_seq; ///< recent reqids on this object - vector > reqids; + mempool::osd_pglog::vector > reqids; uint64_t truncate_seq; uint64_t truncate_size; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 2c9ee772431be..11319aa0f0b2f 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -727,7 +727,7 @@ struct ObjectOperation { uint32_t *out_flags; uint32_t *out_data_digest; uint32_t *out_omap_digest; - vector > *out_reqids; + mempool::osd_pglog::vector > *out_reqids; uint64_t *out_truncate_seq; uint64_t *out_truncate_size; int *prval; @@ -742,7 +742,7 @@ struct ObjectOperation { uint32_t *flags, uint32_t *dd, uint32_t *od, - vector > *oreqids, + mempool::osd_pglog::vector > *oreqids, uint64_t *otseq, uint64_t *otsize, int *r) @@ -817,7 +817,7 @@ struct ObjectOperation { uint32_t *out_flags, uint32_t *out_data_digest, uint32_t *out_omap_digest, - vector > *out_reqids, + mempool::osd_pglog::vector > *out_reqids, uint64_t *truncate_seq, uint64_t *truncate_size, int *prval) { -- 2.39.5