IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

proxy_cache_use_stale/fastcgi_cache_use_stale updating

Browse Source
This commit is contained in:
Igor Sysoev 2009-06-06 18:49:47 +00:00
parent fa524e9063
commit 55192e7470
6 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -178,6 +178,7 @@ static ngx_conf_bitmask_t ngx_http_fastcgi_next_upstream_masks[] = {
{ ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
{ ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
{ ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
{ ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
{ ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
{ ngx_null_string, 0 }
};

1
src/http/modules/ngx_http_proxy_module.c
View File

@ -167,6 +167,7 @@ static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = {
{ ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
{ ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
{ ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
{ ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
{ ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
{ ngx_null_string, 0 }
};

4
src/http/ngx_http_cache.h
View File

@ -14,6 +14,7 @@
#define NGX_HTTP_CACHE_STALE 1
#define NGX_HTTP_CACHE_UPDATING 2
#define NGX_HTTP_CACHE_KEY_LEN 16
@ -36,7 +37,8 @@ typedef struct {
unsigned valid_msec:10;
unsigned error:10;
unsigned exists:1;
/* 13 unused bits */
unsigned updating:1;
/* 12 unused bits */
ngx_file_uniq_t uniq;
time_t expire;

23
src/http/ngx_http_file_cache.c
View File

@ -331,10 +331,23 @@ ngx_http_file_cache_open(ngx_http_request_t *r)
if (c->valid_sec < now) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http file cache expired: %T %T", c->valid_sec, now);
ngx_shmtx_lock(&cache->shpool->mutex);
return NGX_HTTP_CACHE_STALE;
if (c->node->updating) {
rc = NGX_HTTP_CACHE_UPDATING;
} else {
c->node->updating = 1;
rc = NGX_HTTP_CACHE_STALE;
}
ngx_shmtx_unlock(&cache->shpool->mutex);
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http file cache expired: %i %T %T",
rc, c->valid_sec, now);
return rc;
}
return NGX_OK;
@ -648,6 +661,8 @@ ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf)
c->node->exists = 1;
}
c->node->updating = 0;
ngx_shmtx_unlock(&cache->shpool->mutex);
}
@ -730,6 +745,8 @@ ngx_http_file_cache_free(ngx_http_request_t *r, ngx_temp_file_t *tf)
c->node->error = c->error;
}
c->node->updating = 0;
ngx_shmtx_unlock(&cache->shpool->mutex);
if (c->temp_file) {

9
src/http/ngx_http_upstream.c
View File

@ -580,6 +580,15 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http upstream cache: %i", rc);
if (rc == NGX_HTTP_CACHE_UPDATING) {
if (u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) {
rc = NGX_OK;
} else {
rc = NGX_HTTP_CACHE_STALE;
}
}
if (rc == NGX_OK) {
rc = ngx_http_upstream_cache_send(r, u);

5
src/http/ngx_http_upstream.h
View File

@ -24,8 +24,9 @@
#define NGX_HTTP_UPSTREAM_FT_HTTP_503 0x00000040
#define NGX_HTTP_UPSTREAM_FT_HTTP_504 0x00000080
#define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x00000100
#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000200
#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00000400
#define NGX_HTTP_UPSTREAM_FT_UPDATING 0x00000200
#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000400
#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00000800
#define NGX_HTTP_UPSTREAM_FT_NOLIVE 0x40000000
#define NGX_HTTP_UPSTREAM_FT_OFF 0x80000000