osd_types: just pass last_epoch_started to PriorSet

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e13666fc92037ff24dfeb8d78af20cab72eaa1cd..37b246dc0d8ff2e58bb02c78e5bd44e896290760 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -843,11 +843,11 @@ PastIntervals::PriorSet PG::build_prior()
 
   PastIntervals::PriorSet prior = past_intervals.get_prior_set(
     pool.info.ec_pool(),
+    info.history.last_epoch_started,
     get_pgbackend()->get_is_recoverable_predicate(),
     *get_osdmap(),
     up,
     acting,
-    info,
     this);
                                 
   if (prior.pg_down) {

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 47f1e6a6a84740512bb9120c3a81a15b4eeeb011..7a10675bafe1336f1066026f0ec0fdfcb7ed11a2 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3510,11 +3510,11 @@ bool PastIntervals::check_new_interval(
 PastIntervals::PriorSet::PriorSet(
   const PastIntervals &past_intervals,
   bool ec_pool,
+  epoch_t last_epoch_started,
   IsPGRecoverablePredicate *c,
   const OSDMap &osdmap,
   const vector<int> &up,
   const vector<int> &acting,
-  const pg_info_t &info,
   const DoutPrefixProvider *dpp)
   : ec_pool(ec_pool), pg_down(false), pcontdec(c)
 {
@@ -3578,7 +3578,7 @@ PastIntervals::PriorSet::PriorSet(
 
   past_intervals.iterate_mayberw_back_to(
     ec_pool,
-    info.history.last_epoch_started,
+    last_epoch_started,
     [&](epoch_t start, const set<pg_shard_t> &acting) {
       ldpp_dout(dpp, 10) << "build_prior maybe_rw interval:" << start
                         << ", acting: " << acting << dendl;

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index b29d9820f6a2b59a2fc098696d0c289003762fd4..ea4410c6b18fbba636359b043ccee24b75b6fab7 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2731,11 +2731,11 @@ public:
     PriorSet(
       const PastIntervals &past_intervals,
       bool ec_pool,
+      epoch_t last_epoch_started,
       IsPGRecoverablePredicate *c,
       const OSDMap &osdmap,
       const vector<int> &up,
       const vector<int> &acting,
-      const pg_info_t &info,
       const DoutPrefixProvider *dpp);
 
     friend class PastIntervals;