update ceph source to reef 18.1.2

[ceph.git] / ceph / src / osd / OSDMapMapping.h

diff --git a/ceph/src/osd/OSDMapMapping.h b/ceph/src/osd/OSDMapMapping.h
index 70258ff4e8d69652d2f6c6664f442a8f058e0f8f..216c30446a95a216230681f94feb73cf3f7db3bd 100644 (file)
--- a/ceph/src/osd/OSDMapMapping.h
+++ b/ceph/src/osd/OSDMapMapping.h
@@ -115,10 +115,11 @@ protected:
     ParallelPGMapper *m;
 
     WQ(ParallelPGMapper *m_, ThreadPool *tp)
-      : ThreadPool::WorkQueue<Item>("ParallelPGMapper::WQ",
-                                   ceph::timespan::zero(),
-                                   ceph::timespan::zero(),
-                                   tp),
+      : ThreadPool::WorkQueue<Item>(
+       "ParallelPGMapper::WQ",
+       ceph::make_timespan(m_->cct->_conf->threadpool_default_timeout),
+       ceph::timespan::zero(),
+       tp),
         m(m_) {}
 
     bool _enqueue(Item *i) override {
@@ -286,6 +287,9 @@ private:
       mapping->_finish(*osdmap);
     }
   };
+  friend class OSDMapTest;
+  // for testing only
+  void update(const OSDMap& map);
 
 public:
   void get(pg_t pgid,
@@ -321,12 +325,11 @@ public:
     }
   }
 
-  const mempool::osdmap_mapping::vector<pg_t>& get_osd_acting_pgs(unsigned osd) {
+  const mempool::osdmap_mapping::vector<pg_t>& get_osd_acting_pgs(unsigned osd) { 
     ceph_assert(osd < acting_rmap.size());
     return acting_rmap[osd];
   }
 
-  void update(const OSDMap& map);
   void update(const OSDMap& map, pg_t pgid);
 
   std::unique_ptr<MappingJob> start_update(