[nginx] Upstream: suppressed the file cache slab allocator error...

[Roman Arutyunyan]

details:   http://hg.nginx.org/nginx/rev/063f7e75f9ef
branches:  
changeset: 5822:063f7e75f9ef
user:      Roman Arutyunyan <arut at nginx.com>
date:      Fri Sep 05 18:14:59 2014 +0400
description:
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.

diffstat:

 src/http/ngx_http_file_cache.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (21 lines):

diff -r 3f5f0ab59b35 -r 063f7e75f9ef src/http/ngx_http_file_cache.c
--- a/src/http/ngx_http_file_cache.c	Mon Sep 01 18:20:18 2014 +0400
+++ b/src/http/ngx_http_file_cache.c	Fri Sep 05 18:14:59 2014 +0400
@@ -145,6 +145,8 @@ ngx_http_file_cache_init(ngx_shm_zone_t 
     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 @@ ngx_http_file_cache_exists(ngx_http_file
         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;
         }