Merge of r5133, r5134: peer.free() and peer.get() balance.
*) Upstream: only call peer.free() if peer.get() selected a peer. *) Upstream: removed double-free workarounds in peer.free() methods.
This commit is contained in:
parent
d8df7da54f
commit
f413543bd7
|
@ -37,8 +37,6 @@ typedef struct {
|
|||
ngx_event_save_peer_session_pt original_save_session;
|
||||
#endif
|
||||
|
||||
ngx_uint_t failed; /* unsigned:1 */
|
||||
|
||||
} ngx_http_upstream_keepalive_peer_data_t;
|
||||
|
||||
|
||||
|
@ -220,8 +218,6 @@ ngx_http_upstream_get_keepalive_peer(ngx_peer_connection_t *pc, void *data)
|
|||
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
||||
"get keepalive peer");
|
||||
|
||||
kp->failed = 0;
|
||||
|
||||
/* ask balancer */
|
||||
|
||||
rc = kp->original_get_peer(pc, kp->data);
|
||||
|
@ -282,18 +278,12 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
|
|||
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
||||
"free keepalive peer");
|
||||
|
||||
/* remember failed state - peer.free() may be called more than once */
|
||||
|
||||
if (state & NGX_PEER_FAILED) {
|
||||
kp->failed = 1;
|
||||
}
|
||||
|
||||
/* cache valid connections */
|
||||
|
||||
u = kp->upstream;
|
||||
c = pc->connection;
|
||||
|
||||
if (kp->failed
|
||||
if (state & NGX_PEER_FAILED
|
||||
|| c == NULL
|
||||
|| c->read->eof
|
||||
|| c->read->error
|
||||
|
|
|
@ -353,10 +353,6 @@ ngx_http_upstream_free_least_conn_peer(ngx_peer_connection_t *pc,
|
|||
return;
|
||||
}
|
||||
|
||||
if (state == 0 && pc->tries == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
lcp->conns[lcp->rrp.current]--;
|
||||
|
||||
lcp->free_rr_peer(pc, &lcp->rrp, state);
|
||||
|
|
|
@ -2846,14 +2846,16 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
|
|||
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
|
||||
#endif
|
||||
|
||||
if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) {
|
||||
state = NGX_PEER_NEXT;
|
||||
} else {
|
||||
state = NGX_PEER_FAILED;
|
||||
}
|
||||
if (u->peer.sockaddr) {
|
||||
|
||||
if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) {
|
||||
state = NGX_PEER_NEXT;
|
||||
} else {
|
||||
state = NGX_PEER_FAILED;
|
||||
}
|
||||
|
||||
if (ft_type != NGX_HTTP_UPSTREAM_FT_NOLIVE) {
|
||||
u->peer.free(&u->peer, u->peer.data, state);
|
||||
u->peer.sockaddr = NULL;
|
||||
}
|
||||
|
||||
if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
|
||||
|
@ -3013,8 +3015,9 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
|
|||
|
||||
u->finalize_request(r, rc);
|
||||
|
||||
if (u->peer.free) {
|
||||
if (u->peer.free && u->peer.sockaddr) {
|
||||
u->peer.free(&u->peer, u->peer.data, 0);
|
||||
u->peer.sockaddr = NULL;
|
||||
}
|
||||
|
||||
if (u->peer.connection) {
|
||||
|
|
|
@ -584,10 +584,6 @@ ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
|
|||
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
|
||||
"free rr peer %ui %ui", pc->tries, state);
|
||||
|
||||
if (state == 0 && pc->tries == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* TODO: NGX_PEER_KEEPALIVE */
|
||||
|
||||
if (rrp->peers->single) {
|
||||
|
|
Loading…
Reference in New Issue