]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: release dispatch_throttle on reset connection
authorHenry C Chang <henry_c_chang@tcloudcomputing.com>
Mon, 23 Aug 2010 04:39:35 +0000 (21:39 -0700)
committerSage Weil <sage@newdream.net>
Mon, 23 Aug 2010 04:39:35 +0000 (21:39 -0700)
Signed-off-by: Henry C Chang <henry_c_chang@tcloudcomputing.com>
Signed-off-by: Sage Weil <sage@newdream.net>
src/msg/SimpleMessenger.cc

index 14053a261a7171d407e0e1dd4ae26f3096ff480f..56f4f0fa5055576b20ab208cff190a2dc050dc52 100644 (file)
@@ -1258,8 +1258,10 @@ void SimpleMessenger::Pipe::discard_queue()
       (*r)->put();
   out_q.clear();
   for (map<int,list<Message*> >::iterator p = in_q.begin(); p != in_q.end(); p++)
-    for (list<Message*>::iterator r = p->second.begin(); r != p->second.end(); r++)
+    for (list<Message*>::iterator r = p->second.begin(); r != p->second.end(); r++) {
+      messenger->dispatch_throttle_release((*r)->get_dispatch_throttle_size());
       (*r)->put();
+    }
   in_q.clear();
   in_qlen = 0;
 }