From 3755318342d9126eae7de7c2cb25fee394efb8c9 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 8 Nov 2013 15:17:15 -0800 Subject: [PATCH] OSD: remove wake_all_pg_waiters We shouldn't need this -- we check the pg waiters list on each map. Signed-off-by: Samuel Just Reviewed-by: Greg Farnum --- src/osd/OSD.cc | 5 ----- src/osd/OSD.h | 8 -------- 2 files changed, 13 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 67213fe763f..3e354a8aa32 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -5947,8 +5947,6 @@ void OSD::activate_map() dout(7) << "activate_map version " << osdmap->get_epoch() << dendl; - wake_all_pg_waiters(); // the pg mapping may have shifted - if (osdmap->test_flag(CEPH_OSDMAP_FULL)) { dout(10) << " osdmap flagged full, doing onetime osdmap subscribe" << dendl; osdmap_subscribe(osdmap->get_epoch() + 1, true); @@ -7154,9 +7152,6 @@ void OSD::check_replay_queue() dout(10) << "check_replay_queue pgid " << pgid << " (not found)" << dendl; } } - - // wake up _all_ pg waiters; raw pg -> actual pg mapping may have shifted - wake_all_pg_waiters(); } diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 8eb4650d23c..0748af17853 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1431,14 +1431,6 @@ protected: waiting_for_pg.erase(pgid); } } - void wake_all_pg_waiters() { - for (map >::iterator p = waiting_for_pg.begin(); - p != waiting_for_pg.end(); - ++p) - take_waiters_front(p->second); - waiting_for_pg.clear(); - } - // -- pg creation -- struct create_pg_info { -- 2.47.3