From: Roman Arutyunyan Date: Fri, 6 Nov 2026 16:02:09 +0000 (+0400) Subject: Resolver: report error on CNAME restart failure X-Git-Tag: release-1.31.9~11 X-Git-Url: https://git.kaiwu.me/web/%22data:,/doc/static/%7B@url%7D?a=commitdiff_plain;h=8492a8b8a92acb345e1a34a6789f9ebb93f86e22;p=nginx.git Resolver: report error on CNAME restart failure Previously, if restarting a resolve with a CNAME name failed due to a memory allocation error, no error was reported. The waiting requests were left detached from any node until their timeouts expired. Now the error is reported to the waiting requests immediately. --- diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 4d1fd62ca..1ee86e458 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -2550,7 +2550,22 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n, next->node = NULL; } - (void) ngx_resolve_name_locked(r, ctx, &name); + if (ngx_resolve_name_locked(r, ctx, &name) == NGX_ERROR) { + + /* unlock name mutex */ + + do { + ctx->state = NGX_ERROR; + ctx->valid = ngx_time() + (r->valid ? r->valid : 10); + next = ctx->next; + + ctx->handler(ctx); + + ctx = next; + } while (ctx); + + return; + } } /* unlock name mutex */ @@ -2935,7 +2950,22 @@ ngx_resolver_process_srv(ngx_resolver_t *r, u_char *buf, size_t n, next->node = NULL; } - (void) ngx_resolve_name_locked(r, ctx, &name); + if (ngx_resolve_name_locked(r, ctx, &name) == NGX_ERROR) { + + /* unlock name mutex */ + + do { + ctx->state = NGX_ERROR; + ctx->valid = ngx_time() + (r->valid ? r->valid : 10); + next = ctx->next; + + ctx->handler(ctx); + + ctx = next; + } while (ctx); + + return; + } } /* unlock name mutex */