Skip to content

Commit

Permalink
Cache: cache manager limits.
Browse files Browse the repository at this point in the history 
The new parameters "manager_files", "manager_sleep"
and "manager_threshold" were added to proxy_cache_path
and friends.

Note that ngx_path_manager_pt was changed to return ngx_msec_t
instead of time_t (API change).
  • Loading branch information
@xeioex
xeioex committed Oct 5, 2016
1 parent f9430de commit b072a69
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/core/ngx_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct ngx_file_s {
#define NGX_MAX_PATH_LEVEL 3


typedef time_t (*ngx_path_manager_pt) (void *data);
typedef ngx_msec_t (*ngx_path_manager_pt) (void *data);
typedef ngx_msec_t (*ngx_path_purger_pt) (void *data);
typedef void (*ngx_path_loader_pt) (void *data);

Expand Down
4 changes: 4 additions & 0 deletions src/http/ngx_http_cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ struct ngx_http_file_cache_s {
ngx_msec_t loader_sleep;
ngx_msec_t loader_threshold;

ngx_uint_t manager_files;
ngx_msec_t manager_sleep;
ngx_msec_t manager_threshold;

ngx_shm_zone_t *shm_zone;
};

Expand Down
103 changes: 94 additions & 9 deletions src/http/ngx_http_file_cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
size_t len;
time_t now, wait;
ngx_path_t *path;
ngx_msec_t elapsed;
ngx_queue_t *q;
ngx_http_file_cache_node_t *fcn;
u_char key[2 * NGX_HTTP_CACHE_KEY_LEN];
Expand Down Expand Up @@ -1810,7 +1811,7 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)

if (fcn->count == 0) {
ngx_http_file_cache_delete(cache, q, name);
continue;
goto next;
}

if (fcn->deleting) {
Expand All @@ -1836,6 +1837,22 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
"ignore long locked inactive cache entry %*s, count:%d",
(size_t) 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);

next:

if (++cache->files >= cache->manager_files) {
wait = 0;
break;
}

ngx_time_update();

elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));

if (elapsed >= cache->manager_threshold) {
wait = 0;
break;
}
}

ngx_shmtx_unlock(&cache->shpool->mutex);
Expand Down Expand Up @@ -1897,20 +1914,25 @@ ngx_http_file_cache_delete(ngx_http_file_cache_t *cache, ngx_queue_t *q,
}


static time_t
static ngx_msec_t
ngx_http_file_cache_manager(void *data)
{
ngx_http_file_cache_t *cache = data;

off_t size;
time_t next, wait;
ngx_msec_t elapsed;
ngx_uint_t count, watermark;

next = ngx_http_file_cache_expire(cache);

cache->last = ngx_current_msec;
cache->files = 0;

next = ngx_http_file_cache_expire(cache);

if (next == 0) {
return cache->manager_sleep;
}

for ( ;; ) {
ngx_shmtx_lock(&cache->shpool->mutex);

Expand All @@ -1925,17 +1947,29 @@ ngx_http_file_cache_manager(void *data)
size, count, (ngx_int_t) watermark);

if (size < cache->max_size && count < watermark) {
return next;
return (ngx_msec_t) next * 1000;
}

wait = ngx_http_file_cache_forced_expire(cache);

if (wait > 0) {
return wait;
return (ngx_msec_t) wait * 1000;
}

if (ngx_quit || ngx_terminate) {
return next;
return (ngx_msec_t) next * 1000;
}

if (++cache->files >= cache->manager_files) {
return cache->manager_sleep;
}

ngx_time_update();

elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));

if (elapsed >= cache->manager_threshold) {
return cache->manager_sleep;
}
}
}
Expand Down Expand Up @@ -2211,8 +2245,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
size_t len;
ssize_t size;
ngx_str_t s, name, *value;
ngx_int_t loader_files;
ngx_msec_t loader_sleep, loader_threshold;
ngx_int_t loader_files, manager_files;
ngx_msec_t loader_sleep, manager_sleep, loader_threshold,
manager_threshold;
ngx_uint_t i, n, use_temp_path;
ngx_array_t *caches;
ngx_http_file_cache_t *cache, **ce;
Expand All @@ -2230,10 +2265,15 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
use_temp_path = 1;

inactive = 600;

loader_files = 100;
loader_sleep = 50;
loader_threshold = 200;

manager_files = 100;
manager_sleep = 50;
manager_threshold = 200;

name.len = 0;
size = 0;
max_size = NGX_MAX_OFF_T_VALUE;
Expand Down Expand Up @@ -2405,6 +2445,48 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}

if (ngx_strncmp(value[i].data, "manager_files=", 14) == 0) {

manager_files = ngx_atoi(value[i].data + 14, value[i].len - 14);
if (manager_files == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid manager_files value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

continue;
}

if (ngx_strncmp(value[i].data, "manager_sleep=", 14) == 0) {

s.len = value[i].len - 14;
s.data = value[i].data + 14;

manager_sleep = ngx_parse_time(&s, 0);
if (manager_sleep == (ngx_msec_t) NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid manager_sleep value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

continue;
}

if (ngx_strncmp(value[i].data, "manager_threshold=", 18) == 0) {

s.len = value[i].len - 18;
s.data = value[i].data + 18;

manager_threshold = ngx_parse_time(&s, 0);
if (manager_threshold == (ngx_msec_t) NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid manager_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;
Expand All @@ -2425,6 +2507,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cache->loader_files = loader_files;
cache->loader_sleep = loader_sleep;
cache->loader_threshold = loader_threshold;
cache->manager_files = manager_files;
cache->manager_sleep = manager_sleep;
cache->manager_threshold = manager_threshold;

if (ngx_add_path(cf, &cache->path) != NGX_OK) {
return NGX_CONF_ERROR;
Expand Down
6 changes: 3 additions & 3 deletions src/os/unix/ngx_process_cycle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1148,11 +1148,11 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
static void
ngx_cache_manager_process_handler(ngx_event_t *ev)
{
time_t next, n;
ngx_uint_t i;
ngx_msec_t next, n;
ngx_path_t **path;

next = 60 * 60;
next = 60 * 60 * 1000;

path = ngx_cycle->paths.elts;
for (i = 0; i < ngx_cycle->paths.nelts; i++) {
Expand All @@ -1170,7 +1170,7 @@ ngx_cache_manager_process_handler(ngx_event_t *ev)
next = 1;
}

ngx_add_timer(ev, next * 1000);
ngx_add_timer(ev, next);
}


Expand Down
6 changes: 3 additions & 3 deletions src/os/win32/ngx_process_cycle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,11 +921,11 @@ static void
ngx_cache_manager_process_handler(void)
{
u_long ev;
time_t next, n;
ngx_uint_t i;
ngx_msec_t next, n;
ngx_path_t **path;

next = 60 * 60;
next = 60 * 60 * 1000;

path = ngx_cycle->paths.elts;
for (i = 0; i < ngx_cycle->paths.nelts; i++) {
Expand All @@ -943,7 +943,7 @@ ngx_cache_manager_process_handler(void)
next = 1;
}

ev = WaitForSingleObject(ngx_cache_manager_event, (u_long) next * 1000);
ev = WaitForSingleObject(ngx_cache_manager_event, (u_long) next);

if (ev != WAIT_TIMEOUT) {

Expand Down

0 comments on commit b072a69

Please sign in to comment.