From: Haomai Wang <haomai@xsky.com>
Date: Sat, 25 Jun 2016 08:57:59 +0000 (+0800)
Subject: msg/async: keep out_seq inc/dec with sent messages
X-Git-Tag: ses5-milestone5~575^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70cc0704c2c4ea62184bcd1e87caa1ae2eaa868c;p=ceph.git

msg/async: keep out_seq inc/dec with sent messages

Partial revert 84b9088e164b39919065194831455e441a06ef85
Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 8e993675b47c..b5b33eab0f0f 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -2008,6 +2008,7 @@ void AsyncConnection::requeue_sent()
     ldout(async_msgr->cct, 10) << __func__ << " " << *m << " for resend "
                                << " (" << m->get_seq() << ")" << dendl;
     rq.push_front(make_pair(bufferlist(), m));
+    out_seq.dec();
   }
 }
 
@@ -2026,6 +2027,7 @@ void AsyncConnection::discard_requeued_up_to(uint64_t seq)
                          << " <= " << seq << ", discarding" << dendl;
     p.second->put();
     rq.pop_front();
+    out_seq.inc();
   }
   if (rq.empty())
     out_q.erase(CEPH_MSG_PRIO_HIGHEST);