diff options
author | Haomai Wang <haomai@xsky.com> | 2016-06-25 10:57:59 +0200 |
---|---|---|
committer | Haomai Wang <haomai@xsky.com> | 2016-06-28 16:29:59 +0200 |
commit | 70cc0704c2c4ea62184bcd1e87caa1ae2eaa868c (patch) | |
tree | a6d3adc4c61e1de7f0397c9067c66ee09b2e2255 /src/msg/async/AsyncConnection.cc | |
parent | msg/async/AsyncConnection: handle send buffer overflow case (diff) | |
download | ceph-70cc0704c2c4ea62184bcd1e87caa1ae2eaa868c.tar.xz ceph-70cc0704c2c4ea62184bcd1e87caa1ae2eaa868c.zip |
msg/async: keep out_seq inc/dec with sent messages
Partial revert 84b9088e164b39919065194831455e441a06ef85
Signed-off-by: Haomai Wang <haomai@xsky.com>
Diffstat (limited to '')
-rw-r--r-- | src/msg/async/AsyncConnection.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 8e993675b47..b5b33eab0f0 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); |