commit c0b3b9d6ca9e43bb4cb9f9720c467ce1dadf103a
author Roman Arutyunyan <arut@nginx.com> Fri Sep 05 18:14:59 2014 +0400
committer Roman Arutyunyan <arut@nginx.com> Fri Sep 05 18:14:59 2014 +0400
tree e4ead2c79faefb56effc1103092637c3d7eb8e71
parent 37d24e7e3be648a6f73bad18dcf53798a7a1aeb0

Upstream: suppressed the file cache slab allocator error messages.

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.

src/http/ngx_http_file_cache.c

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 71e6e36..2eebc30 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -145,6 +145,8 @@
     ngx_sprintf(cache->shpool->log_ctx, " in cache keys zone \"%V\"%Z",
                 &shm_zone->shm.name);
 
+    cache->shpool->log_nomem = 0;
+
     return NGX_OK;
 }
 
@@ -698,6 +700,8 @@
         fcn = ngx_slab_calloc_locked(cache->shpool,
                                      sizeof(ngx_http_file_cache_node_t));
         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;
             goto failed;
         }