From: Ilya Dryomov Date: Thu, 16 Jun 2016 12:10:11 +0000 (+0200) Subject: AsyncConnection: don't limit recv_max_prefetch with TCP_PREFETCH_MIN_SIZE X-Git-Tag: ses5-milestone5~417^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccc834d3d8e0358177be82803fb2fd10e50c1ea7;p=ceph.git AsyncConnection: don't limit recv_max_prefetch with TCP_PREFETCH_MIN_SIZE simple messenger's prefetch buffer is ms_tcp_prefetch_max_size. Don't cap it with TCP_PREFETCH_MIN_SIZE in the async messenger. Signed-off-by: Ilya Dryomov --- diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 39cc38984a84..3be01c427844 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -125,7 +125,7 @@ AsyncConnection::AsyncConnection(CephContext *cct, AsyncMessenger *m, DispatchQu out_seq(0), ack_left(0), in_seq(0), state(STATE_NONE), state_after_send(STATE_NONE), sd(-1), port(-1), dispatch_queue(q), write_lock("AsyncConnection::write_lock"), can_write(WriteStatus::NOWRITE), open_write(false), keepalive(false), lock("AsyncConnection::lock"), recv_buf(NULL), - recv_max_prefetch(MIN(msgr->cct->_conf->ms_tcp_prefetch_max_size, TCP_PREFETCH_MIN_SIZE)), + recv_max_prefetch(MAX(msgr->cct->_conf->ms_tcp_prefetch_max_size, TCP_PREFETCH_MIN_SIZE)), recv_start(0), recv_end(0), last_active(ceph::coarse_mono_clock::now()), inactive_timeout_us(cct->_conf->ms_tcp_read_timeout*1000*1000),