comparison src/stream/ngx_stream_proxy_module.c @ 7098:7bfbf73db920

Stream: relaxed next upstream condition (ticket #1317). When switching to a next upstream, some buffers could be stuck in the middle of the filter chain. A condition existed that raised an error when this happened. As it turned out, this condition prevented switching to a next upstream if ssl preread was used with the TCP protocol (see the ticket). In fact, the condition does not make sense for TCP, since after successful connection to an upstream switching to another upstream never happens. As for UDP, the issue with stuck buffers is unlikely to happen, but is still possible. Specifically, if a filter delays sending data to upstream. The condition can be relaxed to only check the "buffered" bitmask of the upstream connection. The new condition is simpler and fixes the ticket issue as well. Additionally, the upstream_out chain is now reset for UDP prior to connecting to a new upstream to prevent repeating the client data twice.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 11 Sep 2017 15:32:31 +0300
parents ed1101bbf19f
children 0846dd76a487
comparison
equal deleted inserted replaced
7097:a0e472a2c4f1 7098:7bfbf73db920
1663 "stream proxy next upstream"); 1663 "stream proxy next upstream");
1664 1664
1665 u = s->upstream; 1665 u = s->upstream;
1666 pc = u->peer.connection; 1666 pc = u->peer.connection;
1667 1667
1668 if (u->upstream_out || u->upstream_busy || (pc && pc->buffered)) { 1668 if (pc && pc->buffered) {
1669 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, 1669 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
1670 "pending buffers on next upstream"); 1670 "buffered data on next upstream");
1671 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); 1671 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
1672 return; 1672 return;
1673 }
1674
1675 if (s->connection->type == SOCK_DGRAM) {
1676 u->upstream_out = NULL;
1673 } 1677 }
1674 1678
1675 if (u->peer.sockaddr) { 1679 if (u->peer.sockaddr) {
1676 u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED); 1680 u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED);
1677 u->peer.sockaddr = NULL; 1681 u->peer.sockaddr = NULL;