OSD::shutdown: actually drop sessions waiting on map

There might be messages for which we still don't have the
map.  Dispatching waiting won't actually help.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 75f975a5399177eebaf852829466acd22770be2c..9ac8481a09af295880ad23bfe03c35a8c8c47b99 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2358,7 +2358,7 @@ int OSD::shutdown()
 
   service.start_shutdown();
 
-  dispatch_sessions_waiting_on_map();
+  clear_waiting_sessions();
 
   // Shutdown PGs
   {

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 077702e0a1eca30c62b4a7cae871a1f604b33730..1f9a14479d21ffdf7da08d4409e87ec5a9816fdf 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1166,6 +1166,22 @@ public:
 
   Mutex session_waiting_lock;
   set<Session*> session_waiting_for_map;
+
+  void clear_waiting_sessions() {
+    Mutex::Locker l(session_waiting_lock);
+    for (map<spg_t, set<Session*> >::iterator i =
+          session_waiting_for_pg.begin();
+        i != session_waiting_for_pg.end();
+        ++i) {
+      for (set<Session*>::iterator j = i->second.begin();
+          j != i->second.end();
+          ++j) {
+       (*j)->put();
+      }
+    }
+    session_waiting_for_pg.clear();
+  }
+
   /// Caller assumes refs for included Sessions
   void get_sessions_waiting_for_map(set<Session*> *out) {
     Mutex::Locker l(session_waiting_lock);