From aec5634e5e339531c70718d594a12994e4de1b0e Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 14 May 2014 13:16:45 -0700 Subject: [PATCH] osd_types: remove the pool_id argument from (is|check)_new_interval Signed-off-by: Samuel Just --- src/osd/OSD.cc | 1 - src/osd/PG.cc | 3 --- src/osd/osd_types.cc | 11 ++++------- src/osd/osd_types.h | 2 -- src/test/osd/types.cc | 12 ------------ 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 220eac652723..434e654f057a 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2316,7 +2316,6 @@ void OSD::build_past_intervals_parallel() p.same_interval_since, pg->info.history.last_epoch_clean, cur_map, last_map, - pg->info.pgid.pool(), pg->info.pgid.pgid, &pg->past_intervals, &debug); diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 3cbea636d34f..cc00a89931e0 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -675,7 +675,6 @@ void PG::generate_past_intervals() info.history.last_epoch_clean, cur_map, last_map, - pgid.pool(), pgid, &past_intervals, &debug); @@ -4571,7 +4570,6 @@ bool PG::should_restart_peering( newup, osdmap, lastmap, - info.pgid.pool(), info.pgid.pgid)) { dout(20) << "new interval newup " << newup << " newacting " << newacting << dendl; @@ -4704,7 +4702,6 @@ void PG::start_peering_interval( info.history.last_epoch_clean, osdmap, lastmap, - info.pgid.pool(), info.pgid.pgid, &past_intervals, &debug); diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 6bdbd6119326..f9605d8944e6 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -2197,15 +2197,14 @@ bool pg_interval_t::is_new_interval( const vector &new_up, OSDMapRef osdmap, OSDMapRef lastmap, - int64_t pool_id, pg_t pgid) { return old_acting_primary != new_acting_primary || new_acting != old_acting || old_up_primary != new_up_primary || new_up != old_up || - (!(lastmap->get_pools().count(pool_id))) || - (lastmap->get_pools().find(pool_id)->second.min_size != - osdmap->get_pools().find(pool_id)->second.min_size) || + (!(lastmap->get_pools().count(pgid.pool()))) || + (lastmap->get_pools().find(pgid.pool())->second.min_size != + osdmap->get_pools().find(pgid.pool())->second.min_size) || pgid.is_split(lastmap->get_pg_num(pgid.pool()), osdmap->get_pg_num(pgid.pool()), 0); } @@ -2223,7 +2222,6 @@ bool pg_interval_t::check_new_interval( epoch_t last_epoch_clean, OSDMapRef osdmap, OSDMapRef lastmap, - int64_t pool_id, pg_t pgid, map *past_intervals, std::ostream *out) @@ -2243,7 +2241,6 @@ bool pg_interval_t::check_new_interval( new_up, osdmap, lastmap, - pool_id, pgid)) { pg_interval_t& i = (*past_intervals)[same_interval_since]; i.first = same_interval_since; @@ -2255,7 +2252,7 @@ bool pg_interval_t::check_new_interval( if (!i.acting.empty() && i.primary != -1 && i.acting.size() >= - lastmap->get_pools().find(pool_id)->second.min_size) { + lastmap->get_pools().find(pgid.pool())->second.min_size) { if (out) *out << "generate_past_intervals " << i << ": not rw," diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 67ece00c38df..f3529adbc66f 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1717,7 +1717,6 @@ struct pg_interval_t { const vector &new_up, ///< [in] up as of osdmap ceph::shared_ptr osdmap, ///< [in] current map ceph::shared_ptr lastmap, ///< [in] last map - int64_t poolid, ///< [in] pool for pg pg_t pgid ///< [in] pgid for pg ); @@ -1738,7 +1737,6 @@ struct pg_interval_t { epoch_t last_epoch_clean, ///< [in] current ceph::shared_ptr osdmap, ///< [in] current map ceph::shared_ptr lastmap, ///< [in] last map - int64_t poolid, ///< [in] pool for pg pg_t pgid, ///< [in] pgid for pg map *past_intervals,///< [out] intervals ostream *out = 0 ///< [out] debug ostream diff --git a/src/test/osd/types.cc b/src/test/osd/types.cc index a04f2cba6132..14935d8c66ef 100644 --- a/src/test/osd/types.cc +++ b/src/test/osd/types.cc @@ -182,7 +182,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_TRUE(past_intervals.empty()); @@ -212,7 +211,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_EQ((unsigned int)1, past_intervals.size()); @@ -245,7 +243,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); old_primary = new_primary; @@ -279,7 +276,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_EQ((unsigned int)1, past_intervals.size()); @@ -311,7 +307,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_EQ((unsigned int)1, past_intervals.size()); @@ -350,7 +345,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_EQ((unsigned int)1, past_intervals.size()); @@ -389,7 +383,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals)); ASSERT_EQ((unsigned int)1, past_intervals.size()); @@ -423,7 +416,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals, &out)); @@ -475,7 +467,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals, &out)); @@ -510,7 +501,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals, &out)); @@ -555,7 +545,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals, &out)); @@ -604,7 +593,6 @@ TEST(pg_interval_t, check_new_interval) last_epoch_clean, osdmap, lastmap, - pool_id, pgid, &past_intervals, &out)); -- 2.47.3