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

Resolver: notify all waiting requests on timeout.

Browse Source 
If a "resolver_timeout" occurs, only the first waiting request
was notified.  Other requests may hang forever.
This commit is contained in:
Ruslan Ermilov 2014-08-19 15:43:26 +04:00
parent 8607e64b83
commit da46eed537
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/ngx_resolver.c
View File

@ -417,7 +417,7 @@ ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
/* lock name mutex */ /* lock name mutex */
if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { if (ctx->state == NGX_AGAIN) {
hash = ngx_crc32_short(ctx->name.data, ctx->name.len); hash = ngx_crc32_short(ctx->name.data, ctx->name.len);
@ -664,7 +664,7 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx)
} }
ctx->event->handler = ngx_resolver_timeout_handler; ctx->event->handler = ngx_resolver_timeout_handler;
ctx->event->data = ctx; ctx->event->data = rn;
ctx->event->log = r->log; ctx->event->log = r->log;
ctx->ident = -1; ctx->ident = -1;
@ -857,7 +857,7 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
} }
ctx->event->handler = ngx_resolver_timeout_handler; ctx->event->handler = ngx_resolver_timeout_handler;
ctx->event->data = ctx; ctx->event->data = rn;
ctx->event->log = r->log; ctx->event->log = r->log;
ctx->ident = -1; ctx->ident = -1;
@ -949,7 +949,7 @@ ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
/* lock addr mutex */ /* lock addr mutex */
if (ctx->state == NGX_AGAIN || ctx->state == NGX_RESOLVE_TIMEDOUT) { if (ctx->state == NGX_AGAIN) {
switch (ctx->addr.sockaddr->sa_family) { switch (ctx->addr.sockaddr->sa_family) {
@ -2790,13 +2790,21 @@ done:
static void static void
ngx_resolver_timeout_handler(ngx_event_t *ev) ngx_resolver_timeout_handler(ngx_event_t *ev)
{ {
ngx_resolver_ctx_t *ctx; ngx_resolver_ctx_t *ctx, *next;
ngx_resolver_node_t *rn;
ctx = ev->data; rn = ev->data;
ctx = rn->waiting;
rn->waiting = NULL;
do {
ctx->state = NGX_RESOLVE_TIMEDOUT; ctx->state = NGX_RESOLVE_TIMEDOUT;
next = ctx->next;
ctx->handler(ctx); ctx->handler(ctx);
ctx = next;
} while (ctx);
} }