Mercurial > hg > nginx
changeset 3974:d10bcb07d9d4
loader_files, loader_sleep, and loader_threshold
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 29 Jul 2011 15:09:02 +0000 |
parents | 9d6f21415231 |
children | 3ce20f216ede |
files | src/http/ngx_http_cache.h src/http/ngx_http_file_cache.c |
diffstat | 2 files changed, 71 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_cache.h Mon Jul 25 10:22:38 2011 +0000 +++ b/src/http/ngx_http_cache.h Fri Jul 29 15:09:02 2011 +0000 @@ -118,8 +118,11 @@ time_t inactive; + ngx_uint_t files; + ngx_uint_t loader_files; ngx_msec_t last; - ngx_uint_t files; + ngx_msec_t loader_sleep; + ngx_msec_t loader_threshold; ngx_shm_zone_t *shm_zone; };
--- a/src/http/ngx_http_file_cache.c Mon Jul 25 10:22:38 2011 +0000 +++ b/src/http/ngx_http_file_cache.c Fri Jul 29 15:09:02 2011 +0000 @@ -1265,27 +1265,34 @@ { ngx_msec_t elapsed; - if (cache->files++ > 100) { + if (++cache->files >= cache->loader_files) { ngx_time_update(); elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last)); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, - "http file cache manager time: %M", elapsed); + "http file cache loader time elapsed: %M", elapsed); + + if (elapsed >= cache->loader_threshold) { - if (elapsed > 200) { + if (cache->loader_files > 1) { + cache->loader_files /= 2; + ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, + "cache %V loader_files decreased to %ui", + &cache->path->name, cache->loader_files); - /* - * if processing 100 files takes more than 200ms, - * it seems that many operations require disk i/o, - * therefore sleep 200ms - */ + } else { + cache->loader_sleep *= 2; + ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, + "cache %V loader_sleep increased to %Mms", + &cache->path->name, cache->loader_sleep); + } + } - ngx_msleep(200); + ngx_msleep(cache->loader_sleep); - ngx_time_update(); - } + ngx_time_update(); cache->last = ngx_current_msec; cache->files = 0; @@ -1462,6 +1469,7 @@ time_t inactive; ssize_t size; ngx_str_t s, name, *value; + ngx_int_t loader_files, loader_sleep, loader_threshold; ngx_uint_t i, n; ngx_http_file_cache_t *cache; @@ -1476,6 +1484,9 @@ } inactive = 600; + loader_files = 100; + loader_sleep = 50; + loader_threshold = 200; name.len = 0; size = 0; @@ -1589,6 +1600,48 @@ continue; } + if (ngx_strncmp(value[i].data, "loader_files=", 13) == 0) { + + loader_files = ngx_atoi(value[i].data + 13, value[i].len - 13); + if (loader_files == NGX_ERROR) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid loader_files value \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } + + continue; + } + + if (ngx_strncmp(value[i].data, "loader_sleep=", 13) == 0) { + + s.len = value[i].len - 13; + s.data = value[i].data + 13; + + loader_sleep = ngx_parse_time(&s, 0); + if (loader_sleep < 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid loader_sleep value \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } + + continue; + } + + if (ngx_strncmp(value[i].data, "loader_threshold=", 17) == 0) { + + s.len = value[i].len - 17; + s.data = value[i].data + 17; + + loader_threshold = ngx_parse_time(&s, 0); + if (loader_threshold < 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid loader_threshold value \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } + + continue; + } + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"", &value[i]); return NGX_CONF_ERROR; @@ -1606,6 +1659,9 @@ cache->path->data = cache; cache->path->conf_file = cf->conf_file->file.name.data; cache->path->line = cf->conf_file->line; + cache->loader_files = loader_files; + cache->loader_sleep = (ngx_msec_t) loader_sleep; + cache->loader_threshold = (ngx_msec_t) loader_threshold; if (ngx_add_path(cf, &cache->path) != NGX_OK) { return NGX_CONF_ERROR;