msgr: Let requeue_sent remove items completely, given a seq to remove from.

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 7e958d15885366dbbf3814a31746cfbe949d2ba9..9ce7cafecefd80068959fa72b956becad8c873d6 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1207,7 +1207,7 @@ void SimpleMessenger::Pipe::unregister_pipe()
 }
 
 
-void SimpleMessenger::Pipe::requeue_sent()
+void SimpleMessenger::Pipe::requeue_sent(uint64_t max_acked)
 {
   if (sent.empty())
     return;
@@ -1215,11 +1215,14 @@ void SimpleMessenger::Pipe::requeue_sent()
   list<Message*>& rq = out_q[CEPH_MSG_PRIO_HIGHEST];
   while (!sent.empty()) {
     Message *m = sent.back();
-    sent.pop_back();
-    dout(10) << "requeue_sent " << *m << " for resend seq " << out_seq
-            << " (" << m->get_seq() << ")" << dendl;
-    rq.push_front(m);
-    out_seq--;
+    if (m->get_seq() > max_acked) {
+      sent.pop_back();
+      dout(10) << "requeue_sent " << *m << " for resend seq " << out_seq
+          << " (" << m->get_seq() << ")" << dendl;
+      rq.push_front(m);
+      out_seq--;
+    } else
+      sent.clear();
   }
 }
 

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 78278f256eedbded87e77f18e90f5f8b5d02b721..93e00fe96fe7c93f0927ea6b98421470fece4b55 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -349,7 +349,9 @@ private:
       return m;
     }
 
-    void requeue_sent();
+    /* Remove all messages from the sent queue. Add those with seq > max_acked
+     * to the highest priority outgoing queue. */
+    void requeue_sent(uint64_t max_acked=0);
     void discard_queue();
 
     void force_close() {