mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-29 17:26:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge of r5133, r5134: peer.free() and peer.get() balance.

Browse Source 
*) 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:
Maxim Dounin 2013-03-29 18:16:27 +00:00
parent f064449ea7
commit 4e2bbc23c1
4 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/modules/ngx_http_upstream_keepalive_module.c
View File

@ -37,8 +37,6 @@ typedef struct {
ngx_event_save_peer_session_pt original_save_session; ngx_event_save_peer_session_pt original_save_session;
#endif #endif
ngx_uint_t failed; /* unsigned:1 */
} ngx_http_upstream_keepalive_peer_data_t; } 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, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
"get keepalive peer"); "get keepalive peer");
kp->failed = 0;
/* ask balancer */ /* ask balancer */
rc = kp->original_get_peer(pc, kp->data); 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, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0,
"free keepalive peer"); "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 */ /* cache valid connections */
u = kp->upstream; u = kp->upstream;
c = pc->connection; c = pc->connection;
if (kp->failed if (state & NGX_PEER_FAILED
|| c == NULL || c == NULL
|| c->read->eof || c->read->eof
|| c->read->error || c->read->error

4
src/http/modules/ngx_http_upstream_least_conn_module.c
View File

@ -353,10 +353,6 @@ ngx_http_upstream_free_least_conn_peer(ngx_peer_connection_t *pc,
return; return;
} }
if (state == 0 && pc->tries == 0) {
return;
}
lcp->conns[lcp->rrp.current]--; lcp->conns[lcp->rrp.current]--;
lcp->free_rr_peer(pc, &lcp->rrp, state); lcp->free_rr_peer(pc, &lcp->rrp, state);

17
src/http/ngx_http_upstream.c
View File

@ -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); ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
#endif #endif
if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { if (u->peer.sockaddr) {
state = NGX_PEER_NEXT;
} else { if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) {
state = NGX_PEER_FAILED; 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.free(&u->peer, u->peer.data, state);
u->peer.sockaddr = NULL;
} }
if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) { 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); 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.free(&u->peer, u->peer.data, 0);
u->peer.sockaddr = NULL;
} }
if (u->peer.connection) { if (u->peer.connection) {

4
src/http/ngx_http_upstream_round_robin.c
View File

@ -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, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
"free rr peer %ui %ui", pc->tries, state); "free rr peer %ui %ui", pc->tries, state);
if (state == 0 && pc->tries == 0) {
return;
}
/* TODO: NGX_PEER_KEEPALIVE */ /* TODO: NGX_PEER_KEEPALIVE */
if (rrp->peers->single) { if (rrp->peers->single) {