Merge of r4915, r4916, r4917: upstream minor fixes.
*) Upstream: honor the "down" flag for a single server. If an upstream block was defined with the only server marked as "down", e.g. upstream u { server 127.0.0.1:8080 down; } an attempt was made to contact the server despite the "down" flag. It is believed that immediate 502 response is better in such a case, and it's also consistent with what is currently done in case of multiple servers all marked as "down". *) Upstream: better detection of connect() failures with kqueue. Pending EOF might be reported on both read and write events, whichever comes first, so check both of them. Patch by Yichun Zhang (agentzh), slightly modified.
This commit is contained in:
parent
02615df1bb
commit
aa94ea5dea
|
@ -1809,9 +1809,16 @@ ngx_http_upstream_test_connect(ngx_connection_t *c)
|
|||
#if (NGX_HAVE_KQUEUE)
|
||||
|
||||
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
|
||||
if (c->write->pending_eof || c->read->pending_eof) {
|
||||
if (c->write->pending_eof) {
|
||||
err = c->write->kq_errno;
|
||||
|
||||
} else {
|
||||
err = c->read->kq_errno;
|
||||
}
|
||||
|
||||
c->log->action = "connecting to upstream";
|
||||
(void) ngx_connection_error(c, c->write->kq_errno,
|
||||
(void) ngx_connection_error(c, err,
|
||||
"kevent() reported that connect() failed");
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
|
|
@ -430,6 +430,10 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
|
|||
if (rrp->peers->single) {
|
||||
peer = &rrp->peers->peer[0];
|
||||
|
||||
if (peer->down) {
|
||||
goto failed;
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
/* there are several peers */
|
||||
|
|
Loading…
Reference in New Issue