osd/osd_types: put pg_log_entry_t::extra_reqids in osd_pglog mempool

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 490bd28797a2bdf0dfe246441ace9f020ea024fe..176a682b6a4e831daaf7147364563cc2023c39de 100644 (file)
--- 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<pair<osd_reqid_t, version_t> >::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<pair<osd_reqid_t, version_t> > *pls) const {
+                          mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *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<pair<osd_reqid_t, version_t> >::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<pair<osd_reqid_t, version_t> >::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<pair<osd_reqid_t, version_t> >::const_iterator j =
-              e.extra_reqids.begin();
+        for (auto j = e.extra_reqids.begin();
              j != e.extra_reqids.end();
              ++j) {
           for (ceph::unordered_multimap<osd_reqid_t,pg_log_entry_t*>::iterator k =
@@ -465,8 +461,7 @@ public:
       }
       
       if (indexed_data & PGLOG_INDEXED_EXTRA_CALLER_OPS) {
-        for (vector<pair<osd_reqid_t, version_t> >::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 16ea3922079fa0679cf3a51e8b7b2138499b3f90..f6c1b97d8a3614a5b7ec41040413a3a82e222a0f 100644 (file)
--- 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<pair<osd_reqid_t, version_t> > reqids; // [(reqid, user_version)]
+    mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > reqids; // [(reqid, user_version)]
     map<string, bufferlist> 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<pair<osd_reqid_t, version_t> > extra_reqids;
+    mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > extra_reqids;
 
     CopyFromCallback *copy_cb;
 

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 7f450005c5bdf22cda953d7e6507d85735cc3ad7..dcfe790567ffd6615fdc2e92580fef758b385377 100644 (file)
--- 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<pair<osd_reqid_t, version_t> >::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<pair<osd_reqid_t, version_t> >::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 cc00d2a75d1638f0542ff93d9f6eb97afe26a1a1..3e2128e414ed864c755f6fdd5a19b04d6625dab3 100644 (file)
--- 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<pair<osd_reqid_t, version_t> > extra_reqids;
+  mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > 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<pair<osd_reqid_t, version_t> > reqids;
+  mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > reqids;
 
   uint64_t truncate_seq;
   uint64_t truncate_size;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 2c9ee772431be89d91dcfa3beba8962a40bdef88..11319aa0f0b2f34bedf9f93d1fcf6bce539ef9d8 100644 (file)
--- 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<pair<osd_reqid_t, version_t> > *out_reqids;
+    mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *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<pair<osd_reqid_t, version_t> > *oreqids,
+                             mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *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<pair<osd_reqid_t, version_t> > *out_reqids,
+               mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *out_reqids,
                uint64_t *truncate_seq,
                uint64_t *truncate_size,
                int *prval) {