From: Roman Arutyunyan <arut@nginx.com>
Date: Fri, 5 Sep 2014 14:14:59 +0000 (+0400)
Subject: Upstream: suppressed the file cache slab allocator error messages.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c0b3b9d6ca9e43bb4cb9f9720c467ce1dadf103a;p=nginx.git

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.
---

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 71e6e36c2..2eebc3068 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -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",
                 &shm_zone->shm.name);
 
+    cache->shpool->log_nomem = 0;
+
     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,
                                      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;
         }