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

Cache: proper wakeup of subrequests.

Browse Source 
In case of a cache lock timeout and in the aio handler we now call
r->write_event_handler() instead of a connection write handler,
to make sure to run appropriate subrequest.  Previous code failed to run
inactive subrequests and hence resulted in suboptimal behaviour, see
report by Yichun Zhang:

http://mailman.nginx.org/pipermail/nginx-devel/2013-October/004435.html

(Infinite hang claimed in the report seems impossible without 3rd party
modules, as subrequests will be eventually woken up by the postpone filter.)
This commit is contained in:
Maxim Dounin 2014-12-02 05:54:56 +03:00
parent 10345663c8
commit 6d52912a2a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/ngx_http_file_cache.c
View File

@ -462,6 +462,8 @@ ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev)
"http file cache wait: \"%V?%V\"", &r->uri, &r->args);
ngx_http_file_cache_lock_wait(r, r->cache);
ngx_http_run_posted_requests(c);
}
@ -505,7 +507,7 @@ wakeup:
c->waiting = 0;
r->main->blocked--;
r->connection->write->handler(r->connection->write);
r->write_event_handler(r);
}
@ -692,7 +694,9 @@ ngx_http_cache_aio_event_handler(ngx_event_t *ev)
r->main->blocked--;
r->aio = 0;
r->connection->write->handler(r->connection->write);
r->write_event_handler(r);
ngx_http_run_posted_requests(c);
}
#endif