]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
msg/async: keep out_seq inc/dec with sent messages
authorHaomai Wang <haomai@xsky.com>
Sat, 25 Jun 2016 08:57:59 +0000 (16:57 +0800)
committerHaomai Wang <haomai@xsky.com>
Tue, 28 Jun 2016 14:29:59 +0000 (22:29 +0800)
Partial revert 84b9088e164b39919065194831455e441a06ef85
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/msg/async/AsyncConnection.cc

index 8e993675b47ccc52ff59047b29aafb6bed4889ff..b5b33eab0f0f33968ca4bb99d7a36d22bd6acd35 100644 (file)
@@ -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);