Welcome! Log In Create A New Profile

Advanced

Re: [PATCH 3 of 4] Silenced complaints about socket leaks on forced termination

Sergey Kandaurov
January 26, 2024 07:28AM
> On 27 Nov 2023, at 06:50, Maxim Dounin <mdounin@mdounin.ru> wrote:
>
> # HG changeset patch
> # User Maxim Dounin <mdounin@mdounin.ru>
> # Date 1701049787 -10800
> # Mon Nov 27 04:49:47 2023 +0300
> # Node ID 61d08e4cf97cc073200ec32fc6ada9a2d48ffe51
> # Parent faf0b9defc76b8683af466f8a950c2c241382970
> Silenced complaints about socket leaks on forced termination.
>
> When graceful shutdown was requested, and then nginx was forced to
> do fast shutdown, it used to (incorrectly) complain about open sockets
> left in connections which weren't yet closed when fast shutdown
> was requested.
>
> Fix is to avoid complaining about open sockets when fast shutdown was
> requested after graceful one. Abnormal termination, if requested with
> the WINCH signal, can still happen though.

I've been wondering about such IMHO odd behaviour and support the fix.
There might be an opinion that once you requested graceful shutdown,
you have to wait until it's done, but I think that requesting fast
shutdown afterwards should be legitimate.

>
> diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
> --- a/src/os/unix/ngx_process_cycle.c
> +++ b/src/os/unix/ngx_process_cycle.c
> @@ -948,7 +948,7 @@ ngx_worker_process_exit(ngx_cycle_t *cyc
> }
> }
>
> - if (ngx_exiting) {
> + if (ngx_exiting && !ngx_terminate) {
> c = cycle->connections;
> for (i = 0; i < cycle->connection_n; i++) {
> if (c[i].fd != -1
> @@ -963,11 +963,11 @@ ngx_worker_process_exit(ngx_cycle_t *cyc
> ngx_debug_quit = 1;
> }
> }
> + }
>
> - if (ngx_debug_quit) {
> - ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "aborting");
> - ngx_debug_point();
> - }
> + if (ngx_debug_quit) {
> + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "aborting");
> + ngx_debug_point();
> }
>
> /*
> diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
> --- a/src/os/win32/ngx_process_cycle.c
> +++ b/src/os/win32/ngx_process_cycle.c
> @@ -834,7 +834,7 @@ ngx_worker_process_exit(ngx_cycle_t *cyc
> }
> }
>
> - if (ngx_exiting) {
> + if (ngx_exiting && !ngx_terminate) {
> c = cycle->connections;
> for (i = 0; i < cycle->connection_n; i++) {
> if (c[i].fd != (ngx_socket_t) -1

I think it's fine.

--
Sergey Kandaurov
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[PATCH 0 of 4] aio fixes

Maxim Dounin 405 November 26, 2023 10:10PM

[PATCH 3 of 4] Silenced complaints about socket leaks on forced termination

Maxim Dounin 61 November 26, 2023 10:10PM

Re: [PATCH 3 of 4] Silenced complaints about socket leaks on forced termination

Sergey Kandaurov 48 January 26, 2024 07:28AM

Re: [PATCH 3 of 4] Silenced complaints about socket leaks on forced termination

Maxim Dounin 45 January 29, 2024 02:32AM

[PATCH 2 of 4] Upstream: fixed usage of closed sockets with filter finalization

Maxim Dounin 72 November 26, 2023 10:10PM

Re: [PATCH 2 of 4] Upstream: fixed usage of closed sockets with filter finalization

Sergey Kandaurov 44 January 26, 2024 07:28AM

Re: [PATCH 2 of 4] Upstream: fixed usage of closed sockets with filter finalization

Maxim Dounin 44 January 29, 2024 01:44AM

Re: [PATCH 2 of 4] Upstream: fixed usage of closed sockets with filter finalization

Sergey Kandaurov 43 January 29, 2024 08:24AM

Re: [PATCH 2 of 4] Upstream: fixed usage of closed sockets with filter finalization

Maxim Dounin 44 January 29, 2024 10:08PM

[PATCH 4 of 4] AIO operations now add timers (ticket #2162)

Maxim Dounin 61 November 26, 2023 10:10PM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

J Carter 43 January 08, 2024 06:28AM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

J Carter 47 January 08, 2024 08:32AM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

Maxim Dounin 53 January 09, 2024 01:00AM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

J Carter 62 January 09, 2024 10:12AM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

Sergey Kandaurov 81 January 26, 2024 07:28AM

Re: [PATCH 4 of 4] AIO operations now add timers (ticket #2162)

Maxim Dounin 46 January 29, 2024 02:32AM

[PATCH 1 of 4] Fixed request termination with AIO and subrequests (ticket #2555)

Maxim Dounin 77 November 26, 2023 10:10PM

Re: [PATCH 1 of 4] Fixed request termination with AIO and subrequests (ticket #2555)

Roman Arutyunyan 40 January 26, 2024 07:04AM

Re: [PATCH 1 of 4] Fixed request termination with AIO and subrequests (ticket #2555)

Maxim Dounin 50 January 29, 2024 03:00AM

Re: [PATCH 1 of 4] Fixed request termination with AIO and subrequests (ticket #2555)

Roman Arutyunyan 56 January 29, 2024 09:10AM

Re: [PATCH 1 of 4] Fixed request termination with AIO and subrequests (ticket #2555)

Maxim Dounin 61 January 29, 2024 10:08PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 333
Record Number of Users: 8 on April 13, 2023
Record Number of Guests: 421 on December 02, 2018
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready