From 1a255b92523d672139a297aaae52cdc2be3d0fa9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 10 May 2016 10:22:32 -0400 Subject: [PATCH] osd/OSDMap: consolidate into clean_temps Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 8 +++----- src/osd/OSDMap.cc | 10 ++-------- src/osd/OSDMap.h | 6 ++---- src/test/osd/TestOSDMap.cc | 6 +++--- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 8c16bb76f1e..17cc12d84e7 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1003,11 +1003,9 @@ void OSDMonitor::create_pending() dout(10) << "create_pending e " << pending_inc.epoch << dendl; - // drop any redundant pg_temp entries - OSDMap::remove_redundant_temporaries(g_ceph_context, osdmap, &pending_inc); - - // drop any pg or primary_temp entries with no up entries - OSDMap::remove_down_temps(g_ceph_context, osdmap, &pending_inc); + // clean up pg_temp, primary_temp + OSDMap::clean_temps(g_ceph_context, osdmap, &pending_inc); + dout(10) << "create_pending did clean_temps" << dendl; } void OSDMonitor::maybe_prime_pg_temp() diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 07a963ccd5a..a6fcd3810b0 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1175,14 +1175,8 @@ void OSDMap::dedup(const OSDMap *o, OSDMap *n) n->osd_uuid = o->osd_uuid; } -void OSDMap::remove_redundant_temporaries(CephContext *cct, const OSDMap& osdmap, - OSDMap::Incremental *pending_inc) -{ - ldout(cct, 10) << "remove_redundant_temporaries" << dendl; -} - -void OSDMap::remove_down_temps(CephContext *cct, - const OSDMap& osdmap, Incremental *pending_inc) +void OSDMap::clean_temps(CephContext *cct, + const OSDMap& osdmap, Incremental *pending_inc) { ldout(cct, 10) << __func__ << dendl; OSDMap tmpmap; diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 5b76e0ac310..fe07ccf4831 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -575,10 +575,8 @@ public: /// try to re-use/reference addrs in oldmap from newmap static void dedup(const OSDMap *oldmap, OSDMap *newmap); - static void remove_redundant_temporaries(CephContext *cct, const OSDMap& osdmap, - Incremental *pending_inc); - static void remove_down_temps(CephContext *cct, const OSDMap& osdmap, - Incremental *pending_inc); + static void clean_temps(CephContext *cct, const OSDMap& osdmap, + Incremental *pending_inc); // serialize, unserialize private: diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index 0b50b32858c..7723cb62068 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -250,7 +250,7 @@ TEST_F(OSDMapTest, PrimaryTempRespected) { EXPECT_EQ(acting_primary, acting_osds[1]); } -TEST_F(OSDMapTest, RemovesRedundantTemps) { +TEST_F(OSDMapTest, CleanTemps) { set_up_map(); pg_t rawpg(0, 0, -1); @@ -268,7 +268,7 @@ TEST_F(OSDMapTest, RemovesRedundantTemps) { osdmap.apply_incremental(pgtemp_map); OSDMap::Incremental pending_inc(osdmap.get_epoch() + 1); - OSDMap::remove_redundant_temporaries(g_ceph_context, osdmap, &pending_inc); + OSDMap::clean_temps(g_ceph_context, osdmap, &pending_inc); EXPECT_TRUE(pending_inc.new_pg_temp.count(pgid) && pending_inc.new_pg_temp[pgid].size() == 0); @@ -314,7 +314,7 @@ TEST_F(OSDMapTest, KeepsNecessaryTemps) { OSDMap::Incremental pending_inc(osdmap.get_epoch() + 1); - OSDMap::remove_redundant_temporaries(g_ceph_context, osdmap, &pending_inc); + OSDMap::clean_temps(g_ceph_context, osdmap, &pending_inc); EXPECT_FALSE(pending_inc.new_pg_temp.count(pgid)); EXPECT_FALSE(pending_inc.new_primary_temp.count(pgid)); } -- 2.47.3