IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: suppressed the file cache slab allocator error messages.

Browse Source 
The messages "ngx_slab_alloc() failed: no memory in cache keys zone"
from the file cache slab allocator are suppressed since the allocation
is likely to succeed after the forced expiration of cache nodes.
The second allocation failure is reported.
This commit is contained in:
Roman Arutyunyan 2014-09-05 18:14:59 +04:00
parent 37d24e7e3b
commit c0b3b9d6ca
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/ngx_http_file_cache.c
View File

@ -145,6 +145,8 @@ ngx_http_file_cache_init(ngx_shm_zone_t *shm_zone, void *data)
ngx_sprintf(cache->shpool->log_ctx, " in cache keys zone \"%V\"%Z", ngx_sprintf(cache->shpool->log_ctx, " in cache keys zone \"%V\"%Z",
&shm_zone->shm.name); &shm_zone->shm.name);
cache->shpool->log_nomem = 0;
return NGX_OK; return NGX_OK;
} }
@ -698,6 +700,8 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c)
fcn = ngx_slab_calloc_locked(cache->shpool, fcn = ngx_slab_calloc_locked(cache->shpool,
sizeof(ngx_http_file_cache_node_t)); sizeof(ngx_http_file_cache_node_t));
if (fcn == NULL) { if (fcn == NULL) {
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
"could not allocate node%s", cache->shpool->log_ctx);
rc = NGX_ERROR; rc = NGX_ERROR;
goto failed; goto failed;
} }