aboutsummaryrefslogtreecommitdiff
path: root/src/http/modules/ngx_http_upstream_keepalive_module.c
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2015-08-11 16:28:55 +0300
committerValentin Bartenev <vbart@nginx.com>2015-08-11 16:28:55 +0300
commit50ff8b3c3a3eba0984ce55c63ab8ac07dcb65265 (patch)
treee0dabf7a35438fe72eb650c259f90044289e7085 /src/http/modules/ngx_http_upstream_keepalive_module.c
parent9500e19919b5410b8bc17dbd3d705eef8cf5b1d8 (diff)
downloadnginx-50ff8b3c3a3eba0984ce55c63ab8ac07dcb65265.tar.gz
nginx-50ff8b3c3a3eba0984ce55c63ab8ac07dcb65265.zip
Core: idle connections now closed only once on exiting.
Iterating through all connections takes a lot of CPU time, especially with large number of worker connections configured. As a result nginx processes used to consume CPU time during graceful shutdown. To mitigate this we now only do a full scan for idle connections when shutdown signal is received. Transitions of connections to idle ones are now expected to be avoided if the ngx_exiting flag is set. The upstream keepalive module was modified to follow this.
Diffstat (limited to 'src/http/modules/ngx_http_upstream_keepalive_module.c')
-rw-r--r--src/http/modules/ngx_http_upstream_keepalive_module.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 768881ee4..51887b4e8 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -302,6 +302,10 @@ ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data,
goto invalid;
}
+ if (ngx_terminate || ngx_exiting) {
+ goto invalid;
+ }
+
if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
goto invalid;
}