OSD: clear_session_waiting_on_map in ms_handle_reset

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e1e7a54f99721fd04959e56c7798d5717490233b..75f975a5399177eebaf852829466acd22770be2c 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4358,6 +4358,7 @@ bool OSD::ms_handle_reset(Connection *con)
     return false;
   session->wstate.reset();
   session->con.reset(NULL);  // break con <-> session ref cycle
+  session_handle_reset(session);
   session->put();
   return true;
 }

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 7ce854b0fd076eab9361211da5b061facbf7d6ca..077702e0a1eca30c62b4a7cae871a1f604b33730 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1198,6 +1198,10 @@ public:
       (*i)->put();
     }
   }
+  void session_handle_reset(Session *session) {
+    Mutex::Locker l(session->session_dispatch_lock);
+    clear_session_waiting_on_map(session);
+  }
 
 private:
   /**