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 <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 67213fe763fce1b0fedfd3ff44e895ad79ce802f..3e354a8aa3287fcd2e981795d05e98215c7364e8 100644 (file)
--- 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 8eb4650d23cfbfa33a942f88c12ea0cfd63645a8..0748af1785396a65cf88002c5b9c01973cb7b74d 100644 (file)
--- 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<spg_t, list<OpRequestRef> >::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 {