mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream keepalive: keepalive_timeout directive.

Browse Source 
The directive configures maximum time a connection can be kept in the
cache.  By configuring a time which is smaller than the corresponding
timeout on the backend side one can avoid the race between closing
a connection by the backend and nginx trying to use the same connection
to send a request at the same time.
This commit is contained in:
Maxim Dounin 2018-08-10 21:54:23 +03:00
parent f3d1a925b5
commit 7de808990b
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
typedef struct { typedef struct {
ngx_uint_t max_cached; ngx_uint_t max_cached;
ngx_msec_t timeout;
ngx_queue_t cache; ngx_queue_t cache;
ngx_queue_t free; ngx_queue_t free;
@ -84,6 +85,13 @@ static ngx_command_t ngx_http_upstream_keepalive_commands[] = {
0, 0,
NULL }, NULL },
{ ngx_string("keepalive_timeout"),
NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_upstream_keepalive_srv_conf_t, timeout),
NULL },
ngx_null_command ngx_null_command
}; };
@ -133,6 +141,8 @@ ngx_http_upstream_init_keepalive(ngx_conf_t *cf,
kcf = ngx_http_conf_upstream_srv_conf(us, kcf = ngx_http_conf_upstream_srv_conf(us,
ngx_http_upstream_keepalive_module); ngx_http_upstream_keepalive_module);
ngx_conf_init_msec_value(kcf->timeout, 60000);
if (kcf->original_init_upstream(cf, us) != NGX_OK) { if (kcf->original_init_upstream(cf, us) != NGX_OK) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -261,6 +271,10 @@ found:
c->write->log = pc->log; c->write->log = pc->log;
c->pool->log = pc->log; c->pool->log = pc->log;
if (c->read->timer_set) {
ngx_del_timer(c->read);
}
pc->connection = c; pc->connection = c;
pc->cached = 1; pc->cached = 1;
@ -339,10 +353,9 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
pc->connection = NULL; pc->connection = NULL;
if (c->read->timer_set) { c->read->delayed = 0;
c->read->delayed = 0; ngx_add_timer(c->read, kp->conf->timeout);
ngx_del_timer(c->read);
}
if (c->write->timer_set) { if (c->write->timer_set) {
ngx_del_timer(c->write); ngx_del_timer(c->write);
} }
@ -393,7 +406,7 @@ ngx_http_upstream_keepalive_close_handler(ngx_event_t *ev)
c = ev->data; c = ev->data;
if (c->close) { if (c->close || c->read->timedout) {
goto close; goto close;
} }
@ -486,6 +499,8 @@ ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf)
* conf->max_cached = 0; * conf->max_cached = 0;
*/ */
conf->timeout = NGX_CONF_UNSET_MSEC;
return conf; return conf;
} }