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

Resolver: retry sending queries on errors (ticket #1511).

Browse Source 
Errors when sending UDP datagrams can happen, e.g., when local IP address
changes (see fa0e093b64d7), or an unavailable DNS server on the LAN can cause
send() to fail with EHOSTDOWN on BSD systems.  If this happens during
initial query, retry sending immediately, to a different DNS server when
possible.  If this is not enough, allow normal resend to happen by ignoring
the return code of the second ngx_resolver_send_query() call, much like we
do in ngx_resolver_resend().
This commit is contained in:
Maxim Dounin 2018-07-05 22:21:14 +03:00
parent f206a112c6
commit f62d460d5b
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/ngx_resolver.c
View File

@ -847,7 +847,15 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
rn->nsrvs = 0;
if (ngx_resolver_send_query(r, rn) != NGX_OK) {
goto failed;
/* immediately retry once on failure */
rn->last_connection++;
if (rn->last_connection == r->connections.nelts) {
rn->last_connection = 0;
}
(void) ngx_resolver_send_query(r, rn);
}
if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
@ -1051,7 +1059,15 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
rn->nsrvs = 0;
if (ngx_resolver_send_query(r, rn) != NGX_OK) {
goto failed;
/* immediately retry once on failure */
rn->last_connection++;
if (rn->last_connection == r->connections.nelts) {
rn->last_connection = 0;
}
(void) ngx_resolver_send_query(r, rn);
}
if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {