Hakase/nginx-quic
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Latest update - GitHub 569948a

Browse Source
This commit is contained in:
Hakase
2024-11-22 08:33:54 +09:00
parent ba676aaec9
commit 0f1559a356
37 changed files with 2692 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/pull_request_template.md
+2 -2
View File
@@ -6,5 +6,5 @@ If this pull request addresses an issue on GitHub, make sure to reference that
issue using one of the
[supported keywords](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue).
Before creating a pull request, make sure to comply with
[`Contributing Guidelines`](/CONTRIBUTING.md).
Before creating a pull request, make sure to comply with the
[Contributing Guidelines](https://github.com/nginx/nginx/blob/master/CONTRIBUTING.md).
lib/boringssl
+1 -1
Submodule lib/boringssl updated: e724ef0208...571c76e919
lib/nginx-http-flv-module
+1 -1
Submodule lib/nginx-http-flv-module updated: b26f7f38fc...2cae45cb0c
lib/nginx-module-vts
+1 -1
Submodule lib/nginx-module-vts updated: 724b34d7f1...88a3870e5a
lib/pcre
+1 -1
Submodule lib/pcre updated: 1415565c21...82ebebfd0d
lib/zlib-ng
+1 -1
Submodule lib/zlib-ng updated: d330931dd9...94aacd8bd6
src/core/ngx_cycle.c
+10 -4
View File
@@ -38,7 +38,7 @@ static ngx_connection_t dumb;
ngx_cycle_t *
ngx_init_cycle(ngx_cycle_t *old_cycle)
{
void *rv;
void *rv, *data;
char **senv;
ngx_uint_t i, n;
ngx_log_t *log;
@@ -438,6 +438,8 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
opart = &old_cycle->shared_memory.part;
oshm_zone = opart->elts;
data = NULL;
for (n = 0; /* void */ ; n++) {
if (n >= opart->nelts) {
@@ -461,9 +463,13 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
continue;
}
if (shm_zone[i].tag == oshm_zone[n].tag && shm_zone[i].noreuse) {
data = oshm_zone[n].data;
break;
}
if (shm_zone[i].tag == oshm_zone[n].tag
&& shm_zone[i].shm.size == oshm_zone[n].shm.size
&& !shm_zone[i].noreuse)
&& shm_zone[i].shm.size == oshm_zone[n].shm.size)
{
shm_zone[i].shm.addr = oshm_zone[n].shm.addr;
#if (NGX_WIN32)
@@ -490,7 +496,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
goto failed;
}
if (shm_zone[i].init(&shm_zone[i], NULL) != NGX_OK) {
if (shm_zone[i].init(&shm_zone[i], data) != NGX_OK) {
goto failed;
}
src/event/ngx_event_openssl.c
+1 -1
View File
@@ -1347,7 +1347,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
if (SSL_CTX_set0_tmp_dh_pkey(ssl->ctx, dh) != 1) {
ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
"SSL_CTX_set0_tmp_dh_pkey(\%s\") failed", file->data);
"SSL_CTX_set0_tmp_dh_pkey(\"%s\") failed", file->data);
#if (OPENSSL_VERSION_NUMBER >= 0x3000001fL)
EVP_PKEY_free(dh);
#endif
src/event/ngx_event_openssl_cache.c
+4
View File
@@ -138,6 +138,8 @@ ngx_ssl_cache_fetch(ngx_conf_t *cf, ngx_uint_t index, char **err,
ngx_ssl_cache_type_t *type;
ngx_ssl_cache_node_t *cn;
*err = NULL;
if (ngx_ssl_cache_init_key(cf->pool, index, path, &id) != NGX_OK) {
return NULL;
}
@@ -183,6 +185,8 @@ ngx_ssl_cache_connection_fetch(ngx_pool_t *pool, ngx_uint_t index, char **err,
{
ngx_ssl_cache_key_t id;
*err = NULL;
if (ngx_ssl_cache_init_key(pool, index, path, &id) != NGX_OK) {
return NULL;
}
src/http/modules/ngx_http_fastcgi_module.c
+1 -1
View File
@@ -2877,7 +2877,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
*
* conf->index.len = { 0, NULL };
* conf->index = { 0, NULL };
*/
conf->upstream.store = NGX_CONF_UNSET;
src/http/modules/ngx_http_grpc_module.c
+6 -2
View File
@@ -4475,12 +4475,16 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
prev->upstream.ssl_session_reuse, 1);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
"DEFAULT");
src/http/modules/ngx_http_mp4_module.c
+17 -1
View File
@@ -3176,7 +3176,10 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
start_sample -= n;
prev_samples = samples;
if (next_chunk > chunk) {
prev_samples = samples;
}
chunk = next_chunk;
samples = ngx_mp4_get_32value(entry->samples);
id = ngx_mp4_get_32value(entry->id);
@@ -3186,6 +3189,13 @@ ngx_http_mp4_crop_stsc_data(ngx_http_mp4_file_t *mp4,
next_chunk = trak->chunks + 1;
if (next_chunk < chunk) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"unordered mp4 stsc chunks in \"%s\"",
mp4->file.name.data);
return NGX_ERROR;
}
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
"sample:%uD, chunk:%uD, chunks:%uD, samples:%uD",
start_sample, chunk, next_chunk - chunk, samples);
@@ -3211,6 +3221,12 @@ found:
return NGX_ERROR;
}
if (chunk == 0) {
ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
"zero chunk in \"%s\"", mp4->file.name.data);
return NGX_ERROR;
}
target_chunk = chunk - 1;
target_chunk += start_sample / samples;
chunk_samples = start_sample % samples;
src/http/modules/ngx_http_proxy_module.c
+6 -2
View File
@@ -3733,12 +3733,16 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
prev->upstream.ssl_session_reuse, 1);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
"DEFAULT");
src/http/modules/ngx_http_scgi_module.c
+15
View File
@@ -1283,6 +1283,21 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
return NULL;
}
/*
* set by ngx_pcalloc():
*
* conf->upstream.bufs.num = 0;
* conf->upstream.ignore_headers = 0;
* conf->upstream.next_upstream = 0;
* conf->upstream.cache_zone = NULL;
* conf->upstream.cache_use_stale = 0;
* conf->upstream.cache_methods = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
*/
conf->upstream.store = NGX_CONF_UNSET;
conf->upstream.store_access = NGX_CONF_UNSET_UINT;
conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
src/http/modules/ngx_http_ssl_module.c
+6 -2
View File
@@ -691,12 +691,16 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->early_data, prev->early_data, 1);
ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
NGX_SSL_BUFSIZE);
src/http/modules/ngx_http_upstream_hash_module.c
+79 -9
View File
@@ -24,6 +24,9 @@ typedef struct {
typedef struct {
ngx_http_complex_value_t key;
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_uint_t config;
#endif
ngx_http_upstream_chash_points_t *points;
} ngx_http_upstream_hash_srv_conf_t;
@@ -49,6 +52,8 @@ static ngx_int_t ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc,
static ngx_int_t ngx_http_upstream_init_chash(ngx_conf_t *cf,
ngx_http_upstream_srv_conf_t *us);
static ngx_int_t ngx_http_upstream_update_chash(ngx_pool_t *pool,
ngx_http_upstream_srv_conf_t *us);
static int ngx_libc_cdecl
ngx_http_upstream_chash_cmp_points(const void *one, const void *two);
static ngx_uint_t ngx_http_upstream_find_chash_point(
@@ -178,11 +183,18 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
ngx_http_upstream_rr_peers_rlock(hp->rrp.peers);
if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
if (hp->tries > 20 || hp->rrp.peers->number < 2 || hp->key.len == 0) {
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
return hp->get_rr_peer(pc, &hp->rrp);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (hp->rrp.peers->config && hp->rrp.config != *hp->rrp.peers->config) {
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
return hp->get_rr_peer(pc, &hp->rrp);
}
#endif
now = ngx_time();
pc->cached = 0;
@@ -262,6 +274,7 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
}
hp->rrp.current = peer;
ngx_http_upstream_rr_peer_ref(hp->rrp.peers, peer);
pc->sockaddr = peer->sockaddr;
pc->socklen = peer->socklen;
@@ -284,6 +297,26 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
static ngx_int_t
ngx_http_upstream_init_chash(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
{
if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
return NGX_ERROR;
}
us->peer.init = ngx_http_upstream_init_chash_peer;
#if (NGX_HTTP_UPSTREAM_ZONE)
if (us->shm_zone) {
return NGX_OK;
}
#endif
return ngx_http_upstream_update_chash(cf->pool, us);
}
static ngx_int_t
ngx_http_upstream_update_chash(ngx_pool_t *pool,
ngx_http_upstream_srv_conf_t *us)
{
u_char *host, *port, c;
size_t host_len, port_len, size;
@@ -299,25 +332,32 @@ ngx_http_upstream_init_chash(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
u_char byte[4];
} prev_hash;
if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
return NGX_ERROR;
}
hcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_upstream_hash_module);
us->peer.init = ngx_http_upstream_init_chash_peer;
if (hcf->points) {
ngx_free(hcf->points);
hcf->points = NULL;
}
peers = us->peer.data;
npoints = peers->total_weight * 160;
size = sizeof(ngx_http_upstream_chash_points_t)
+ sizeof(ngx_http_upstream_chash_point_t) * (npoints - 1);
- sizeof(ngx_http_upstream_chash_point_t)
+ sizeof(ngx_http_upstream_chash_point_t) * npoints;
points = ngx_palloc(cf->pool, size);
points = pool ? ngx_palloc(pool, size) : ngx_alloc(size, ngx_cycle->log);
if (points == NULL) {
return NGX_ERROR;
}
points->number = 0;
if (npoints == 0) {
hcf->points = points;
return NGX_OK;
}
for (peer = peers->peer; peer; peer = peer->next) {
server = &peer->server;
@@ -401,7 +441,6 @@ ngx_http_upstream_init_chash(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
points->number = i + 1;
hcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_upstream_hash_module);
hcf->points = points;
return NGX_OK;
@@ -481,7 +520,22 @@ ngx_http_upstream_init_chash_peer(ngx_http_request_t *r,
ngx_http_upstream_rr_peers_rlock(hp->rrp.peers);
hp->hash = ngx_http_upstream_find_chash_point(hcf->points, hash);
#if (NGX_HTTP_UPSTREAM_ZONE)
if (hp->rrp.peers->config
&& (hcf->points == NULL || hcf->config != *hp->rrp.peers->config))
{
if (ngx_http_upstream_update_chash(NULL, us) != NGX_OK) {
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_ERROR;
}
hcf->config = *hp->rrp.peers->config;
}
#endif
if (hcf->points->number) {
hp->hash = ngx_http_upstream_find_chash_point(hcf->points, hash);
}
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
@@ -517,6 +571,20 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
pc->cached = 0;
pc->connection = NULL;
if (hp->rrp.peers->number == 0) {
pc->name = hp->rrp.peers->name;
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_BUSY;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (hp->rrp.peers->config && hp->rrp.config != *hp->rrp.peers->config) {
pc->name = hp->rrp.peers->name;
ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_BUSY;
}
#endif
now = ngx_time();
hcf = hp->conf;
@@ -597,6 +665,7 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
found:
hp->rrp.current = best;
ngx_http_upstream_rr_peer_ref(hp->rrp.peers, best);
pc->sockaddr = best->sockaddr;
pc->socklen = best->socklen;
@@ -664,6 +733,7 @@ ngx_http_upstream_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
uscf->flags = NGX_HTTP_UPSTREAM_CREATE
|NGX_HTTP_UPSTREAM_MODIFY
|NGX_HTTP_UPSTREAM_WEIGHT
|NGX_HTTP_UPSTREAM_MAX_CONNS
|NGX_HTTP_UPSTREAM_MAX_FAILS
src/http/modules/ngx_http_upstream_ip_hash_module.c
+11 -1
View File
@@ -163,11 +163,19 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
ngx_http_upstream_rr_peers_rlock(iphp->rrp.peers);
if (iphp->tries > 20 || iphp->rrp.peers->single) {
if (iphp->tries > 20 || iphp->rrp.peers->number < 2) {
ngx_http_upstream_rr_peers_unlock(iphp->rrp.peers);
return iphp->get_rr_peer(pc, &iphp->rrp);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (iphp->rrp.peers->config && iphp->rrp.config != *iphp->rrp.peers->config)
{
ngx_http_upstream_rr_peers_unlock(iphp->rrp.peers);
return iphp->get_rr_peer(pc, &iphp->rrp);
}
#endif
now = ngx_time();
pc->cached = 0;
@@ -232,6 +240,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
}
iphp->rrp.current = peer;
ngx_http_upstream_rr_peer_ref(iphp->rrp.peers, peer);
pc->sockaddr = peer->sockaddr;
pc->socklen = peer->socklen;
@@ -268,6 +277,7 @@ ngx_http_upstream_ip_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf->peer.init_upstream = ngx_http_upstream_init_ip_hash;
uscf->flags = NGX_HTTP_UPSTREAM_CREATE
|NGX_HTTP_UPSTREAM_MODIFY
|NGX_HTTP_UPSTREAM_WEIGHT
|NGX_HTTP_UPSTREAM_MAX_CONNS
|NGX_HTTP_UPSTREAM_MAX_FAILS
src/http/modules/ngx_http_upstream_least_conn_module.c
+12
View File
@@ -124,6 +124,12 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
ngx_http_upstream_rr_peers_wlock(peers);
#if (NGX_HTTP_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
goto busy;
}
#endif
best = NULL;
total = 0;
@@ -244,6 +250,7 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
best->conns++;
rrp->current = best;
ngx_http_upstream_rr_peer_ref(peers, best);
n = p / (8 * sizeof(uintptr_t));
m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
@@ -280,6 +287,10 @@ failed:
ngx_http_upstream_rr_peers_wlock(peers);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
busy:
#endif
ngx_http_upstream_rr_peers_unlock(peers);
pc->name = peers->name;
@@ -303,6 +314,7 @@ ngx_http_upstream_least_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf->peer.init_upstream = ngx_http_upstream_init_least_conn;
uscf->flags = NGX_HTTP_UPSTREAM_CREATE
|NGX_HTTP_UPSTREAM_MODIFY
|NGX_HTTP_UPSTREAM_WEIGHT
|NGX_HTTP_UPSTREAM_MAX_CONNS
|NGX_HTTP_UPSTREAM_MAX_FAILS
src/http/modules/ngx_http_upstream_random_module.c
+32 -3
View File
@@ -17,6 +17,9 @@ typedef struct {
typedef struct {
ngx_uint_t two;
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_uint_t config;
#endif
ngx_http_upstream_random_range_t *ranges;
} ngx_http_upstream_random_srv_conf_t;
@@ -127,6 +130,11 @@ ngx_http_upstream_update_random(ngx_pool_t *pool,
rcf = ngx_http_conf_upstream_srv_conf(us, ngx_http_upstream_random_module);
if (rcf->ranges) {
ngx_free(rcf->ranges);
rcf->ranges = NULL;
}
peers = us->peer.data;
size = peers->number * sizeof(ngx_http_upstream_random_range_t);
@@ -186,11 +194,15 @@ ngx_http_upstream_init_random_peer(ngx_http_request_t *r,
ngx_http_upstream_rr_peers_rlock(rp->rrp.peers);
#if (NGX_HTTP_UPSTREAM_ZONE)
if (rp->rrp.peers->shpool && rcf->ranges == NULL) {
if (rp->rrp.peers->config
&& (rcf->ranges == NULL || rcf->config != *rp->rrp.peers->config))
{
if (ngx_http_upstream_update_random(NULL, us) != NGX_OK) {
ngx_http_upstream_rr_peers_unlock(rp->rrp.peers);
return NGX_ERROR;
}
rcf->config = *rp->rrp.peers->config;
}
#endif
@@ -220,11 +232,18 @@ ngx_http_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
ngx_http_upstream_rr_peers_rlock(peers);
if (rp->tries > 20 || peers->single) {
if (rp->tries > 20 || peers->number < 2) {
ngx_http_upstream_rr_peers_unlock(peers);
return ngx_http_upstream_get_round_robin_peer(pc, rrp);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
ngx_http_upstream_rr_peers_unlock(peers);
return ngx_http_upstream_get_round_robin_peer(pc, rrp);
}
#endif
pc->cached = 0;
pc->connection = NULL;
@@ -274,6 +293,7 @@ ngx_http_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_http_upstream_rr_peer_ref(peers, peer);
if (now - peer->checked > peer->fail_timeout) {
peer->checked = now;
@@ -314,11 +334,18 @@ ngx_http_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
ngx_http_upstream_rr_peers_wlock(peers);
if (rp->tries > 20 || peers->single) {
if (rp->tries > 20 || peers->number < 2) {
ngx_http_upstream_rr_peers_unlock(peers);
return ngx_http_upstream_get_round_robin_peer(pc, rrp);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
ngx_http_upstream_rr_peers_unlock(peers);
return ngx_http_upstream_get_round_robin_peer(pc, rrp);
}
#endif
pc->cached = 0;
pc->connection = NULL;
@@ -384,6 +411,7 @@ ngx_http_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_http_upstream_rr_peer_ref(peers, peer);
if (now - peer->checked > peer->fail_timeout) {
peer->checked = now;
@@ -467,6 +495,7 @@ ngx_http_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf->peer.init_upstream = ngx_http_upstream_init_random;
uscf->flags = NGX_HTTP_UPSTREAM_CREATE
|NGX_HTTP_UPSTREAM_MODIFY
|NGX_HTTP_UPSTREAM_WEIGHT
|NGX_HTTP_UPSTREAM_MAX_CONNS
|NGX_HTTP_UPSTREAM_MAX_FAILS
src/http/modules/ngx_http_upstream_zone_module.c
+690 -8
View File
@@ -15,9 +15,22 @@ static char *ngx_http_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd,
static ngx_int_t ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone,
void *data);
static ngx_http_upstream_rr_peers_t *ngx_http_upstream_zone_copy_peers(
ngx_slab_pool_t *shpool, ngx_http_upstream_srv_conf_t *uscf);
ngx_slab_pool_t *shpool, ngx_http_upstream_srv_conf_t *uscf,
ngx_http_upstream_srv_conf_t *ouscf);
static ngx_http_upstream_rr_peer_t *ngx_http_upstream_zone_copy_peer(
ngx_http_upstream_rr_peers_t *peers, ngx_http_upstream_rr_peer_t *src);
static ngx_int_t ngx_http_upstream_zone_preresolve(
ngx_http_upstream_rr_peer_t *resolve,
ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *oresolve,
ngx_http_upstream_rr_peers_t *opeers);
static void ngx_http_upstream_zone_set_single(
ngx_http_upstream_srv_conf_t *uscf);
static void ngx_http_upstream_zone_remove_peer_locked(
ngx_http_upstream_rr_peers_t *peers, ngx_http_upstream_rr_peer_t *peer);
static ngx_int_t ngx_http_upstream_zone_init_worker(ngx_cycle_t *cycle);
static void ngx_http_upstream_zone_resolve_timer(ngx_event_t *event);
static void ngx_http_upstream_zone_resolve_handler(ngx_resolver_ctx_t *ctx);
static ngx_command_t ngx_http_upstream_zone_commands[] = {
@@ -55,7 +68,7 @@ ngx_module_t ngx_http_upstream_zone_module = {
NGX_HTTP_MODULE, /* module type */
NULL, /* init master */
NULL, /* init module */
NULL, /* init process */
ngx_http_upstream_zone_init_worker, /* init process */
NULL, /* init thread */
NULL, /* exit thread */
NULL, /* exit process */
@@ -121,11 +134,11 @@ static ngx_int_t
ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
{
size_t len;
ngx_uint_t i;
ngx_uint_t i, j;
ngx_slab_pool_t *shpool;
ngx_http_upstream_rr_peers_t *peers, **peersp;
ngx_http_upstream_srv_conf_t *uscf, **uscfp;
ngx_http_upstream_main_conf_t *umcf;
ngx_http_upstream_srv_conf_t *uscf, *ouscf, **uscfp, **ouscfp;
ngx_http_upstream_main_conf_t *umcf, *oumcf;
shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
umcf = shm_zone->data;
@@ -162,6 +175,7 @@ ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
/* copy peers to shared memory */
peersp = (ngx_http_upstream_rr_peers_t **) (void *) &shpool->data;
oumcf = data;
for (i = 0; i < umcf->upstreams.nelts; i++) {
uscf = uscfp[i];
@@ -170,7 +184,38 @@ ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
continue;
}
peers = ngx_http_upstream_zone_copy_peers(shpool, uscf);
ouscf = NULL;
if (oumcf) {
ouscfp = oumcf->upstreams.elts;
for (j = 0; j < oumcf->upstreams.nelts; j++) {
if (ouscfp[j]->shm_zone == NULL) {
continue;
}
if (ouscfp[j]->shm_zone->shm.name.len != shm_zone->shm.name.len
|| ngx_memcmp(ouscfp[j]->shm_zone->shm.name.data,
shm_zone->shm.name.data,
shm_zone->shm.name.len)
!= 0)
{
continue;
}
if (ouscfp[j]->host.len == uscf->host.len
&& ngx_memcmp(ouscfp[j]->host.data, uscf->host.data,
uscf->host.len)
== 0)
{
ouscf = ouscfp[j];
break;
}
}
}
peers = ngx_http_upstream_zone_copy_peers(shpool, uscf, ouscf);
if (peers == NULL) {
return NGX_ERROR;
}
@@ -185,11 +230,19 @@ ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
static ngx_http_upstream_rr_peers_t *
ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
ngx_http_upstream_srv_conf_t *uscf)
ngx_http_upstream_srv_conf_t *uscf, ngx_http_upstream_srv_conf_t *ouscf)
{
ngx_str_t *name;
ngx_uint_t *config;
ngx_http_upstream_rr_peer_t *peer, **peerp;
ngx_http_upstream_rr_peers_t *peers, *backup;
ngx_http_upstream_rr_peers_t *peers, *opeers, *backup;
opeers = (ouscf ? ouscf->peer.data : NULL);
config = ngx_slab_calloc(shpool, sizeof(ngx_uint_t));
if (config == NULL) {
return NULL;
}
peers = ngx_slab_alloc(shpool, sizeof(ngx_http_upstream_rr_peers_t));
if (peers == NULL) {
@@ -214,6 +267,7 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
peers->name = name;
peers->shpool = shpool;
peers->config = config;
for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
@@ -223,6 +277,27 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
}
*peerp = peer;
(*peers->config)++;
}
for (peerp = &peers->resolve; *peerp; peerp = &peer->next) {
peer = ngx_http_upstream_zone_copy_peer(peers, *peerp);
if (peer == NULL) {
return NULL;
}
*peerp = peer;
(*peers->config)++;
}
if (opeers) {
if (ngx_http_upstream_zone_preresolve(peers->resolve, peers,
opeers->resolve, opeers)
!= NGX_OK)
{
return NULL;
}
}
if (peers->next == NULL) {
@@ -239,6 +314,7 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
backup->name = name;
backup->shpool = shpool;
backup->config = config;
for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
@@ -248,14 +324,45 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
}
*peerp = peer;
(*backup->config)++;
}
for (peerp = &backup->resolve; *peerp; peerp = &peer->next) {
peer = ngx_http_upstream_zone_copy_peer(backup, *peerp);
if (peer == NULL) {
return NULL;
}
*peerp = peer;
(*backup->config)++;
}
peers->next = backup;
if (opeers && opeers->next) {
if (ngx_http_upstream_zone_preresolve(peers->resolve, backup,
opeers->resolve, opeers->next)
!= NGX_OK)
{
return NULL;
}
if (ngx_http_upstream_zone_preresolve(backup->resolve, backup,
opeers->next->resolve,
opeers->next)
!= NGX_OK)
{
return NULL;
}
}
done:
uscf->peer.data = peers;
ngx_http_upstream_zone_set_single(uscf);
return peers;
}
@@ -279,6 +386,7 @@ ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers,
dst->sockaddr = NULL;
dst->name.data = NULL;
dst->server.data = NULL;
dst->host = NULL;
}
dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t));
@@ -301,12 +409,53 @@ ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers,
}
ngx_memcpy(dst->server.data, src->server.data, src->server.len);
if (src->host) {
dst->host = ngx_slab_calloc_locked(pool,
sizeof(ngx_http_upstream_host_t));
if (dst->host == NULL) {
goto failed;
}
dst->host->name.data = ngx_slab_alloc_locked(pool,
src->host->name.len);
if (dst->host->name.data == NULL) {
goto failed;
}
dst->host->peers = peers;
dst->host->peer = dst;
dst->host->name.len = src->host->name.len;
ngx_memcpy(dst->host->name.data, src->host->name.data,
src->host->name.len);
if (src->host->service.len) {
dst->host->service.data = ngx_slab_alloc_locked(pool,
src->host->service.len);
if (dst->host->service.data == NULL) {
goto failed;
}
dst->host->service.len = src->host->service.len;
ngx_memcpy(dst->host->service.data, src->host->service.data,
src->host->service.len);
}
}
}
return dst;
failed:
if (dst->host) {
if (dst->host->name.data) {
ngx_slab_free_locked(pool, dst->host->name.data);
}
ngx_slab_free_locked(pool, dst->host);
}
if (dst->server.data) {
ngx_slab_free_locked(pool, dst->server.data);
}
@@ -323,3 +472,536 @@ failed:
return NULL;
}
static ngx_int_t
ngx_http_upstream_zone_preresolve(ngx_http_upstream_rr_peer_t *resolve,
ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *oresolve,
ngx_http_upstream_rr_peers_t *opeers)
{
in_port_t port;
ngx_str_t *server;
ngx_http_upstream_host_t *host;
ngx_http_upstream_rr_peer_t *peer, *template, *opeer, **peerp;
if (resolve == NULL || oresolve == NULL) {
return NGX_OK;
}
for (peerp = &peers->peer; *peerp; peerp = &(*peerp)->next) {
/* void */
}
ngx_http_upstream_rr_peers_rlock(opeers);
for (template = resolve; template; template = template->next) {
for (opeer = oresolve; opeer; opeer = opeer->next) {
if (opeer->host->name.len != template->host->name.len
|| ngx_memcmp(opeer->host->name.data,
template->host->name.data,
template->host->name.len)
!= 0)
{
continue;
}
if (opeer->host->service.len != template->host->service.len
|| ngx_memcmp(opeer->host->service.data,
template->host->service.data,
template->host->service.len)
!= 0)
{
continue;
}
host = opeer->host;
for (opeer = opeers->peer; opeer; opeer = opeer->next) {
if (opeer->host != host) {
continue;
}
peer = ngx_http_upstream_zone_copy_peer(peers, NULL);
if (peer == NULL) {
ngx_http_upstream_rr_peers_unlock(opeers);
return NGX_ERROR;
}
ngx_memcpy(peer->sockaddr, opeer->sockaddr, opeer->socklen);
if (template->host->service.len == 0) {
port = ngx_inet_get_port(template->sockaddr);
ngx_inet_set_port(peer->sockaddr, port);
}
peer->socklen = opeer->socklen;
peer->name.len = ngx_sock_ntop(peer->sockaddr, peer->socklen,
peer->name.data,
NGX_SOCKADDR_STRLEN, 1);
peer->host = template->host;
template->host->valid = host->valid;
server = template->host->service.len ? &opeer->server
: &template->server;
peer->server.data = ngx_slab_alloc(peers->shpool, server->len);
if (peer->server.data == NULL) {
ngx_http_upstream_rr_peers_unlock(opeers);
return NGX_ERROR;
}
ngx_memcpy(peer->server.data, server->data, server->len);
peer->server.len = server->len;
if (host->service.len == 0) {
peer->weight = template->weight;
} else {
peer->weight = (template->weight != 1 ? template->weight
: opeer->weight);
}
peer->effective_weight = peer->weight;
peer->max_conns = template->max_conns;
peer->max_fails = template->max_fails;
peer->fail_timeout = template->fail_timeout;
peer->down = template->down;
(*peers->config)++;
*peerp = peer;
peerp = &peer->next;
peers->number++;
peers->tries += (peer->down == 0);
peers->total_weight += peer->weight;
peers->weighted = (peers->total_weight != peers->number);
}
break;
}
}
ngx_http_upstream_rr_peers_unlock(opeers);
return NGX_OK;
}
static void
ngx_http_upstream_zone_set_single(ngx_http_upstream_srv_conf_t *uscf)
{
ngx_http_upstream_rr_peers_t *peers;
peers = uscf->peer.data;
if (peers->number == 1
&& (peers->next == NULL || peers->next->number == 0))
{
peers->single = 1;
} else {
peers->single = 0;
}
}
static void
ngx_http_upstream_zone_remove_peer_locked(ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *peer)
{
peers->total_weight -= peer->weight;
peers->number--;
peers->tries -= (peer->down == 0);
(*peers->config)++;
peers->weighted = (peers->total_weight != peers->number);
ngx_http_upstream_rr_peer_free(peers, peer);
}
static ngx_int_t
ngx_http_upstream_zone_init_worker(ngx_cycle_t *cycle)
{
time_t now;
ngx_msec_t timer;
ngx_uint_t i;
ngx_event_t *event;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_srv_conf_t *uscf, **uscfp;
ngx_http_upstream_main_conf_t *umcf;
if (ngx_process != NGX_PROCESS_WORKER
&& ngx_process != NGX_PROCESS_SINGLE)
{
return NGX_OK;
}
now = ngx_time();
umcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_upstream_module);
if (umcf == NULL) {
return NGX_OK;
}
uscfp = umcf->upstreams.elts;
for (i = 0; i < umcf->upstreams.nelts; i++) {
uscf = uscfp[i];
if (uscf->shm_zone == NULL) {
continue;
}
peers = uscf->peer.data;
do {
ngx_http_upstream_rr_peers_wlock(peers);
for (peer = peers->resolve; peer; peer = peer->next) {
if (peer->host->worker != ngx_worker) {
continue;
}
event = &peer->host->event;
ngx_memzero(event, sizeof(ngx_event_t));
event->data = uscf;
event->handler = ngx_http_upstream_zone_resolve_timer;
event->log = cycle->log;
event->cancelable = 1;
timer = (peer->host->valid > now)
? (ngx_msec_t) 1000 * (peer->host->valid - now) : 1;
ngx_add_timer(event, timer);
}
ngx_http_upstream_rr_peers_unlock(peers);
peers = peers->next;
} while (peers);
}
return NGX_OK;
}
static void
ngx_http_upstream_zone_resolve_timer(ngx_event_t *event)
{
ngx_resolver_ctx_t *ctx;
ngx_http_upstream_host_t *host;
ngx_http_upstream_srv_conf_t *uscf;
host = (ngx_http_upstream_host_t *) event;
uscf = event->data;
ctx = ngx_resolve_start(uscf->resolver, NULL);
if (ctx == NULL) {
goto retry;
}
if (ctx == NGX_NO_RESOLVER) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"no resolver defined to resolve %V", &host->name);
return;
}
ctx->name = host->name;
ctx->handler = ngx_http_upstream_zone_resolve_handler;
ctx->data = host;
ctx->timeout = uscf->resolver_timeout;
ctx->service = host->service;
ctx->cancelable = 1;
if (ngx_resolve_name(ctx) == NGX_OK) {
return;
}
retry:
ngx_add_timer(event, ngx_max(uscf->resolver_timeout, 1000));
}
#define ngx_http_upstream_zone_addr_marked(addr) \
((uintptr_t) (addr)->sockaddr & 1)
#define ngx_http_upstream_zone_mark_addr(addr) \
(addr)->sockaddr = (struct sockaddr *) ((uintptr_t) (addr)->sockaddr | 1)
#define ngx_http_upstream_zone_unmark_addr(addr) \
(addr)->sockaddr = \
(struct sockaddr *) ((uintptr_t) (addr)->sockaddr & ~((uintptr_t) 1))
static void
ngx_http_upstream_zone_resolve_handler(ngx_resolver_ctx_t *ctx)
{
time_t now;
u_short min_priority;
in_port_t port;
ngx_str_t *server;
ngx_msec_t timer;
ngx_uint_t i, j, backup, addr_backup;
ngx_event_t *event;
ngx_resolver_addr_t *addr;
ngx_resolver_srv_name_t *srv;
ngx_http_upstream_host_t *host;
ngx_http_upstream_rr_peer_t *peer, *template, **peerp;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_srv_conf_t *uscf;
host = ctx->data;
event = &host->event;
uscf = event->data;
peers = host->peers;
template = host->peer;
ngx_http_upstream_rr_peers_wlock(peers);
now = ngx_time();
for (i = 0; i < ctx->nsrvs; i++) {
srv = &ctx->srvs[i];
if (srv->state) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"%V could not be resolved (%i: %s) "
"while resolving service %V of %V",
&srv->name, srv->state,
ngx_resolver_strerror(srv->state), &ctx->service,
&ctx->name);
}
}
if (ctx->state) {
if (ctx->service.len) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"service %V of %V could not be resolved (%i: %s)",
&ctx->service, &ctx->name, ctx->state,
ngx_resolver_strerror(ctx->state));
} else {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"%V could not be resolved (%i: %s)",
&ctx->name, ctx->state,
ngx_resolver_strerror(ctx->state));
}
if (ctx->state != NGX_RESOLVE_NXDOMAIN) {
ngx_http_upstream_rr_peers_unlock(peers);
ngx_resolve_name_done(ctx);
ngx_add_timer(event, ngx_max(uscf->resolver_timeout, 1000));
return;
}
/* NGX_RESOLVE_NXDOMAIN */
ctx->naddrs = 0;
}
backup = 0;
min_priority = 65535;
for (i = 0; i < ctx->naddrs; i++) {
min_priority = ngx_min(ctx->addrs[i].priority, min_priority);
}
#if (NGX_DEBUG)
{
u_char text[NGX_SOCKADDR_STRLEN];
size_t len;
for (i = 0; i < ctx->naddrs; i++) {
len = ngx_sock_ntop(ctx->addrs[i].sockaddr, ctx->addrs[i].socklen,
text, NGX_SOCKADDR_STRLEN, 1);
ngx_log_debug7(NGX_LOG_DEBUG_HTTP, event->log, 0,
"name %V was resolved to %*s "
"s:\"%V\" n:\"%V\" w:%d %s",
&host->name, len, text, &host->service,
&ctx->addrs[i].name, ctx->addrs[i].weight,
ctx->addrs[i].priority != min_priority ? "backup" : "");
}
}
#endif
again:
for (peerp = &peers->peer; *peerp; /* void */ ) {
peer = *peerp;
if (peer->host != host) {
goto next;
}
for (j = 0; j < ctx->naddrs; j++) {
addr = &ctx->addrs[j];
addr_backup = (addr->priority != min_priority);
if (addr_backup != backup) {
continue;
}
if (ngx_http_upstream_zone_addr_marked(addr)) {
continue;
}
if (ngx_cmp_sockaddr(peer->sockaddr, peer->socklen,
addr->sockaddr, addr->socklen,
host->service.len != 0)
!= NGX_OK)
{
continue;
}
if (host->service.len) {
if (addr->name.len != peer->server.len
|| ngx_strncmp(addr->name.data, peer->server.data,
addr->name.len))
{
continue;
}
if (template->weight == 1 && addr->weight != peer->weight) {
continue;
}
}
ngx_http_upstream_zone_mark_addr(addr);
goto next;
}
*peerp = peer->next;
ngx_http_upstream_zone_remove_peer_locked(peers, peer);
ngx_http_upstream_zone_set_single(uscf);
continue;
next:
peerp = &peer->next;
}
for (i = 0; i < ctx->naddrs; i++) {
addr = &ctx->addrs[i];
addr_backup = (addr->priority != min_priority);
if (addr_backup != backup) {
continue;
}
if (ngx_http_upstream_zone_addr_marked(addr)) {
ngx_http_upstream_zone_unmark_addr(addr);
continue;
}
ngx_shmtx_lock(&peers->shpool->mutex);
peer = ngx_http_upstream_zone_copy_peer(peers, NULL);
ngx_shmtx_unlock(&peers->shpool->mutex);
if (peer == NULL) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"cannot add new server to upstream \"%V\", "
"memory exhausted", peers->name);
goto done;
}
ngx_memcpy(peer->sockaddr, addr->sockaddr, addr->socklen);
if (host->service.len == 0) {
port = ngx_inet_get_port(template->sockaddr);
ngx_inet_set_port(peer->sockaddr, port);
}
peer->socklen = addr->socklen;
peer->name.len = ngx_sock_ntop(peer->sockaddr, peer->socklen,
peer->name.data, NGX_SOCKADDR_STRLEN, 1);
peer->host = template->host;
server = host->service.len ? &addr->name : &template->server;
peer->server.data = ngx_slab_alloc(peers->shpool, server->len);
if (peer->server.data == NULL) {
ngx_http_upstream_rr_peer_free(peers, peer);
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"cannot add new server to upstream \"%V\", "
"memory exhausted", peers->name);
goto done;
}
peer->server.len = server->len;
ngx_memcpy(peer->server.data, server->data, server->len);
if (host->service.len == 0) {
peer->weight = template->weight;
} else {
peer->weight = (template->weight != 1 ? template->weight
: addr->weight);
}
peer->effective_weight = peer->weight;
peer->max_conns = template->max_conns;
peer->max_fails = template->max_fails;
peer->fail_timeout = template->fail_timeout;
peer->down = template->down;
*peerp = peer;
peerp = &peer->next;
peers->number++;
peers->tries += (peer->down == 0);
peers->total_weight += peer->weight;
peers->weighted = (peers->total_weight != peers->number);
(*peers->config)++;
ngx_http_upstream_zone_set_single(uscf);
}
if (host->service.len && peers->next) {
ngx_http_upstream_rr_peers_unlock(peers);
peers = peers->next;
backup = 1;
ngx_http_upstream_rr_peers_wlock(peers);
goto again;
}
done:
host->valid = ctx->valid;
ngx_http_upstream_rr_peers_unlock(peers);
while (++i < ctx->naddrs) {
ngx_http_upstream_zone_unmark_addr(&ctx->addrs[i]);
}
timer = (ngx_msec_t) 1000 * (ctx->valid > now ? ctx->valid - now + 1 : 1);
ngx_resolve_name_done(ctx);
ngx_add_timer(event, timer);
}
src/http/modules/ngx_http_uwsgi_module.c
+28 -2
View File
@@ -1511,6 +1511,28 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
return NULL;
}
/*
* set by ngx_pcalloc():
*
* conf->upstream.bufs.num = 0;
* conf->upstream.ignore_headers = 0;
* conf->upstream.next_upstream = 0;
* conf->upstream.cache_zone = NULL;
* conf->upstream.cache_use_stale = 0;
* conf->upstream.cache_methods = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
*
* conf->uwsgi_string = { 0, NULL };
* conf->ssl = 0;
* conf->ssl_protocols = 0;
* conf->ssl_ciphers = { 0, NULL };
* conf->ssl_trusted_certificate = { 0, NULL };
* conf->ssl_crl = { 0, NULL };
*/
conf->modifier1 = NGX_CONF_UNSET_UINT;
conf->modifier2 = NGX_CONF_UNSET_UINT;
@@ -1877,12 +1899,16 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
prev->upstream.ssl_session_reuse, 1);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
"DEFAULT");
src/http/ngx_http_upstream.c
+167
View File
@@ -169,6 +169,10 @@ static ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r,
static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy);
static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
#if (NGX_HTTP_UPSTREAM_ZONE)
static char *ngx_http_upstream_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
#endif
static ngx_int_t ngx_http_upstream_set_local(ngx_http_request_t *r,
ngx_http_upstream_t *u, ngx_http_upstream_local_t *local);
@@ -339,6 +343,24 @@ static ngx_command_t ngx_http_upstream_commands[] = {
0,
NULL },
#if (NGX_HTTP_UPSTREAM_ZONE)
{ ngx_string("resolver"),
NGX_HTTP_UPS_CONF|NGX_CONF_1MORE,
ngx_http_upstream_resolver,
NGX_HTTP_SRV_CONF_OFFSET,
0,
NULL },
{ ngx_string("resolver_timeout"),
NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_upstream_srv_conf_t, resolver_timeout),
NULL },
#endif
ngx_null_command
};
@@ -1565,6 +1587,26 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
u->state->peer = u->peer.name;
#if (NGX_HTTP_UPSTREAM_ZONE)
if (u->upstream && u->upstream->shm_zone
&& (u->upstream->flags & NGX_HTTP_UPSTREAM_MODIFY))
{
u->state->peer = ngx_palloc(r->pool,
sizeof(ngx_str_t) + u->peer.name->len);
if (u->state->peer == NULL) {
ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
}
u->state->peer->len = u->peer.name->len;
u->state->peer->data = (u_char *) (u->state->peer + 1);
ngx_memcpy(u->state->peer->data, u->peer.name->data, u->peer.name->len);
u->peer.name = u->state->peer;
}
#endif
if (rc == NGX_BUSY) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams");
ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);
@@ -6066,6 +6108,7 @@ ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
u.no_port = 1;
uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE
|NGX_HTTP_UPSTREAM_MODIFY
|NGX_HTTP_UPSTREAM_WEIGHT
|NGX_HTTP_UPSTREAM_MAX_CONNS
|NGX_HTTP_UPSTREAM_MAX_FAILS
@@ -6171,6 +6214,9 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_url_t u;
ngx_int_t weight, max_conns, max_fails;
ngx_uint_t i;
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_uint_t resolve;
#endif
ngx_http_upstream_server_t *us;
us = ngx_array_push(uscf->servers);
@@ -6186,6 +6232,9 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
max_conns = 0;
max_fails = 1;
fail_timeout = 10;
#if (NGX_HTTP_UPSTREAM_ZONE)
resolve = 0;
#endif
for (i = 2; i < cf->args->nelts; i++) {
@@ -6274,6 +6323,26 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (ngx_strcmp(value[i].data, "resolve") == 0) {
resolve = 1;
continue;
}
if (ngx_strncmp(value[i].data, "service=", 8) == 0) {
us->service.len = value[i].len - 8;
us->service.data = &value[i].data[8];
if (us->service.len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "service is empty");
return NGX_CONF_ERROR;
}
continue;
}
#endif
goto invalid;
}
@@ -6282,6 +6351,22 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
u.url = value[1];
u.default_port = 80;
#if (NGX_HTTP_UPSTREAM_ZONE)
if (resolve) {
/* resolve at run time */
u.no_resolve = 1;
}
if (us->service.len && !resolve) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" requires "
"\"resolve\" parameter",
&u.url);
return NGX_CONF_ERROR;
}
#endif
if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -6292,8 +6377,61 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
us->name = u.url;
#if (NGX_HTTP_UPSTREAM_ZONE)
if (us->service.len && !u.no_port) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" may not have port",
&us->name);
return NGX_CONF_ERROR;
}
if (us->service.len && u.naddrs) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" requires domain name",
&us->name);
return NGX_CONF_ERROR;
}
if (resolve && u.naddrs == 0) {
ngx_addr_t *addr;
/* save port */
addr = ngx_pcalloc(cf->pool, sizeof(ngx_addr_t));
if (addr == NULL) {
return NGX_CONF_ERROR;
}
addr->sockaddr = ngx_palloc(cf->pool, u.socklen);
if (addr->sockaddr == NULL) {
return NGX_CONF_ERROR;
}
ngx_memcpy(addr->sockaddr, &u.sockaddr, u.socklen);
addr->socklen = u.socklen;
us->addrs = addr;
us->naddrs = 1;
us->host = u.host;
} else {
us->addrs = u.addrs;
us->naddrs = u.naddrs;
}
#else
us->addrs = u.addrs;
us->naddrs = u.naddrs;
#endif
us->weight = weight;
us->max_conns = max_conns;
us->max_fails = max_fails;
@@ -6318,6 +6456,32 @@ not_supported:
}
#if (NGX_HTTP_UPSTREAM_ZONE)
static char *
ngx_http_upstream_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_upstream_srv_conf_t *uscf = conf;
ngx_str_t *value;
if (uscf->resolver) {
return "is duplicate";
}
value = cf->args->elts;
uscf->resolver = ngx_resolver_create(cf, &value[1], cf->args->nelts - 1);
if (uscf->resolver == NULL) {
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}
#endif
ngx_http_upstream_srv_conf_t *
ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
{
@@ -6399,6 +6563,9 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
uscf->line = cf->conf_file->line;
uscf->port = u->port;
uscf->no_port = u->no_port;
#if (NGX_HTTP_UPSTREAM_ZONE)
uscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
#endif
if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
uscf->servers = ngx_array_create(cf->pool, 1,
src/http/ngx_http_upstream.h
+9 -1
View File
@@ -104,7 +104,12 @@ typedef struct {
unsigned backup:1;
NGX_COMPAT_BEGIN(6)
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_str_t host;
ngx_str_t service;
#endif
NGX_COMPAT_BEGIN(2)
NGX_COMPAT_END
} ngx_http_upstream_server_t;
@@ -115,6 +120,7 @@ typedef struct {
#define NGX_HTTP_UPSTREAM_FAIL_TIMEOUT 0x0008
#define NGX_HTTP_UPSTREAM_DOWN 0x0010
#define NGX_HTTP_UPSTREAM_BACKUP 0x0020
#define NGX_HTTP_UPSTREAM_MODIFY 0x0040
#define NGX_HTTP_UPSTREAM_MAX_CONNS 0x0100
@@ -133,6 +139,8 @@ struct ngx_http_upstream_srv_conf_s {
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_shm_zone_t *shm_zone;
ngx_resolver_t *resolver;
ngx_msec_t resolver_timeout;
#endif
};
src/http/ngx_http_upstream_round_robin.c
+203 -10
View File
@@ -32,10 +32,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
ngx_http_upstream_srv_conf_t *us)
{
ngx_url_t u;
ngx_uint_t i, j, n, w, t;
ngx_uint_t i, j, n, r, w, t;
ngx_http_upstream_server_t *server;
ngx_http_upstream_rr_peer_t *peer, **peerp;
ngx_http_upstream_rr_peers_t *peers, *backup;
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_uint_t resolve;
ngx_http_core_loc_conf_t *clcf;
ngx_http_upstream_rr_peer_t **rpeerp;
#endif
us->peer.init = ngx_http_upstream_init_round_robin_peer;
@@ -43,14 +48,33 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
server = us->servers->elts;
n = 0;
r = 0;
w = 0;
t = 0;
#if (NGX_HTTP_UPSTREAM_ZONE)
resolve = 0;
#endif
for (i = 0; i < us->servers->nelts; i++) {
#if (NGX_HTTP_UPSTREAM_ZONE)
if (server[i].host.len) {
resolve = 1;
}
#endif
if (server[i].backup) {
continue;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (server[i].host.len) {
r++;
continue;
}
#endif
n += server[i].naddrs;
w += server[i].naddrs * server[i].weight;
@@ -59,7 +83,53 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
}
}
if (n == 0) {
#if (NGX_HTTP_UPSTREAM_ZONE)
if (us->shm_zone) {
if (resolve && !(us->flags & NGX_HTTP_UPSTREAM_MODIFY)) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"load balancing method does not support"
" resolving names at run time in"
" upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
if (us->resolver == NULL) {
us->resolver = clcf->resolver;
}
/*
* Without "resolver_timeout" in http{} the merged value is unset.
*/
ngx_conf_merge_msec_value(us->resolver_timeout,
clcf->resolver_timeout, 30000);
if (resolve
&& (us->resolver == NULL
|| us->resolver->connections.nelts == 0))
{
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no resolver defined to resolve names"
" at run time in upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
} else if (resolve) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"resolving names at run time requires"
" upstream \"%V\" in %s:%ui"
" to be in shared memory",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
#endif
if (n + r == 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no servers in upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
@@ -71,7 +141,8 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
return NGX_ERROR;
}
peer = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peer_t) * n);
peer = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peer_t)
* (n + r));
if (peer == NULL) {
return NGX_ERROR;
}
@@ -86,11 +157,47 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
n = 0;
peerp = &peers->peer;
#if (NGX_HTTP_UPSTREAM_ZONE)
rpeerp = &peers->resolve;
#endif
for (i = 0; i < us->servers->nelts; i++) {
if (server[i].backup) {
continue;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (server[i].host.len) {
peer[n].host = ngx_pcalloc(cf->pool,
sizeof(ngx_http_upstream_host_t));
if (peer[n].host == NULL) {
return NGX_ERROR;
}
peer[n].host->name = server[i].host;
peer[n].host->service = server[i].service;
peer[n].sockaddr = server[i].addrs[0].sockaddr;
peer[n].socklen = server[i].addrs[0].socklen;
peer[n].name = server[i].addrs[0].name;
peer[n].weight = server[i].weight;
peer[n].effective_weight = server[i].weight;
peer[n].current_weight = 0;
peer[n].max_conns = server[i].max_conns;
peer[n].max_fails = server[i].max_fails;
peer[n].fail_timeout = server[i].fail_timeout;
peer[n].down = server[i].down;
peer[n].server = server[i].name;
*rpeerp = &peer[n];
rpeerp = &peer[n].next;
n++;
continue;
}
#endif
for (j = 0; j < server[i].naddrs; j++) {
peer[n].sockaddr = server[i].addrs[j].sockaddr;
peer[n].socklen = server[i].addrs[j].socklen;
@@ -115,6 +222,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
/* backup servers */
n = 0;
r = 0;
w = 0;
t = 0;
@@ -123,6 +231,13 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
continue;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (server[i].host.len) {
r++;
continue;
}
#endif
n += server[i].naddrs;
w += server[i].naddrs * server[i].weight;
@@ -131,7 +246,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
}
}
if (n == 0) {
if (n == 0
#if (NGX_HTTP_UPSTREAM_ZONE)
&& !resolve
#endif
) {
return NGX_OK;
}
if (n + r == 0 && !(us->flags & NGX_HTTP_UPSTREAM_BACKUP)) {
return NGX_OK;
}
@@ -140,12 +263,16 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
return NGX_ERROR;
}
peer = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peer_t) * n);
peer = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peer_t)
* (n + r));
if (peer == NULL) {
return NGX_ERROR;
}
peers->single = 0;
if (n > 0) {
peers->single = 0;
}
backup->single = 0;
backup->number = n;
backup->weighted = (w != n);
@@ -156,11 +283,47 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
n = 0;
peerp = &backup->peer;
#if (NGX_HTTP_UPSTREAM_ZONE)
rpeerp = &backup->resolve;
#endif
for (i = 0; i < us->servers->nelts; i++) {
if (!server[i].backup) {
continue;
}
#if (NGX_HTTP_UPSTREAM_ZONE)
if (server[i].host.len) {
peer[n].host = ngx_pcalloc(cf->pool,
sizeof(ngx_http_upstream_host_t));
if (peer[n].host == NULL) {
return NGX_ERROR;
}
peer[n].host->name = server[i].host;
peer[n].host->service = server[i].service;
peer[n].sockaddr = server[i].addrs[0].sockaddr;
peer[n].socklen = server[i].addrs[0].socklen;
peer[n].name = server[i].addrs[0].name;
peer[n].weight = server[i].weight;
peer[n].effective_weight = server[i].weight;
peer[n].current_weight = 0;
peer[n].max_conns = server[i].max_conns;
peer[n].max_fails = server[i].max_fails;
peer[n].fail_timeout = server[i].fail_timeout;
peer[n].down = server[i].down;
peer[n].server = server[i].name;
*rpeerp = &peer[n];
rpeerp = &peer[n].next;
n++;
continue;
}
#endif
for (j = 0; j < server[i].naddrs; j++) {
peer[n].sockaddr = server[i].addrs[j].sockaddr;
peer[n].socklen = server[i].addrs[j].socklen;
@@ -273,7 +436,12 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
rrp->peers = us->peer.data;
rrp->current = NULL;
rrp->config = 0;
ngx_http_upstream_rr_peers_rlock(rrp->peers);
#if (NGX_HTTP_UPSTREAM_ZONE)
rrp->config = rrp->peers->config ? *rrp->peers->config : 0;
#endif
n = rrp->peers->number;
@@ -281,6 +449,10 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
n = rrp->peers->next->number;
}
r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers);
ngx_http_upstream_rr_peers_unlock(rrp->peers);
if (n <= 8 * sizeof(uintptr_t)) {
rrp->tried = &rrp->data;
rrp->data = 0;
@@ -296,7 +468,6 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer;
r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer;
r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers);
#if (NGX_HTTP_SSL)
r->upstream->peer.set_session =
ngx_http_upstream_set_round_robin_peer_session;
@@ -446,6 +617,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
peers = rrp->peers;
ngx_http_upstream_rr_peers_wlock(peers);
#if (NGX_HTTP_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
goto busy;
}
#endif
if (peers->single) {
peer = peers->peer;
@@ -458,6 +635,7 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_http_upstream_rr_peer_ref(peers, peer);
} else {
@@ -510,6 +688,10 @@ failed:
ngx_http_upstream_rr_peers_wlock(peers);
}
#if (NGX_HTTP_UPSTREAM_ZONE)
busy:
#endif
ngx_http_upstream_rr_peers_unlock(peers);
pc->name = peers->name;
@@ -580,6 +762,7 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
}
rrp->current = best;
ngx_http_upstream_rr_peer_ref(rrp->peers, best);
n = p / (8 * sizeof(uintptr_t));
m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
@@ -617,9 +800,16 @@ ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
if (rrp->peers->single) {
if (peer->fails) {
peer->fails = 0;
}
peer->conns--;
ngx_http_upstream_rr_peer_unlock(rrp->peers, peer);
if (ngx_http_upstream_rr_peer_unref(rrp->peers, peer) == NGX_OK) {
ngx_http_upstream_rr_peer_unlock(rrp->peers, peer);
}
ngx_http_upstream_rr_peers_unlock(rrp->peers);
pc->tries = 0;
@@ -661,7 +851,10 @@ ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
peer->conns--;
ngx_http_upstream_rr_peer_unlock(rrp->peers, peer);
if (ngx_http_upstream_rr_peer_unref(rrp->peers, peer) == NGX_OK) {
ngx_http_upstream_rr_peer_unlock(rrp->peers, peer);
}
ngx_http_upstream_rr_peers_unlock(rrp->peers);
if (pc->tries) {
src/http/ngx_http_upstream_round_robin.h
+85 -3
View File
@@ -14,8 +14,25 @@
#include <ngx_http.h>
typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t;
typedef struct ngx_http_upstream_rr_peer_s ngx_http_upstream_rr_peer_t;
#if (NGX_HTTP_UPSTREAM_ZONE)
typedef struct {
ngx_event_t event; /* must be first */
ngx_uint_t worker;
ngx_str_t name;
ngx_str_t service;
time_t valid;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_rr_peer_t *peer;
} ngx_http_upstream_host_t;
#endif
struct ngx_http_upstream_rr_peer_s {
struct sockaddr *sockaddr;
socklen_t socklen;
@@ -46,24 +63,28 @@ struct ngx_http_upstream_rr_peer_s {
#endif
#if (NGX_HTTP_UPSTREAM_ZONE)
unsigned zombie:1;
ngx_atomic_t lock;
ngx_uint_t refs;
ngx_http_upstream_host_t *host;
#endif
ngx_http_upstream_rr_peer_t *next;
NGX_COMPAT_BEGIN(32)
NGX_COMPAT_BEGIN(15)
NGX_COMPAT_END
};
typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t;
struct ngx_http_upstream_rr_peers_s {
ngx_uint_t number;
#if (NGX_HTTP_UPSTREAM_ZONE)
ngx_slab_pool_t *shpool;
ngx_atomic_t rwlock;
ngx_uint_t *config;
ngx_http_upstream_rr_peer_t *resolve;
ngx_http_upstream_rr_peers_t *zone_next;
#endif
@@ -114,6 +135,65 @@ struct ngx_http_upstream_rr_peers_s {
ngx_rwlock_unlock(&peer->lock); \
}
#define ngx_http_upstream_rr_peer_ref(peers, peer) \
(peer)->refs++;
static ngx_inline void
ngx_http_upstream_rr_peer_free_locked(ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *peer)
{
if (peer->refs) {
peer->zombie = 1;
return;
}
ngx_slab_free_locked(peers->shpool, peer->sockaddr);
ngx_slab_free_locked(peers->shpool, peer->name.data);
if (peer->server.data) {
ngx_slab_free_locked(peers->shpool, peer->server.data);
}
#if (NGX_HTTP_SSL)
if (peer->ssl_session) {
ngx_slab_free_locked(peers->shpool, peer->ssl_session);
}
#endif
ngx_slab_free_locked(peers->shpool, peer);
}
static ngx_inline void
ngx_http_upstream_rr_peer_free(ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *peer)
{
ngx_shmtx_lock(&peers->shpool->mutex);
ngx_http_upstream_rr_peer_free_locked(peers, peer);
ngx_shmtx_unlock(&peers->shpool->mutex);
}
static ngx_inline ngx_int_t
ngx_http_upstream_rr_peer_unref(ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *peer)
{
peer->refs--;
if (peers->shpool == NULL) {
return NGX_OK;
}
if (peer->refs == 0 && peer->zombie) {
ngx_http_upstream_rr_peer_free(peers, peer);
return NGX_DONE;
}
return NGX_OK;
}
#else
#define ngx_http_upstream_rr_peers_rlock(peers)
@@ -121,6 +201,8 @@ struct ngx_http_upstream_rr_peers_s {
#define ngx_http_upstream_rr_peers_unlock(peers)
#define ngx_http_upstream_rr_peer_lock(peers, peer)
#define ngx_http_upstream_rr_peer_unlock(peers, peer)
#define ngx_http_upstream_rr_peer_ref(peers, peer)
#define ngx_http_upstream_rr_peer_unref(peers, peer) NGX_OK
#endif
src/mail/ngx_mail_ssl_module.c
+6 -2
View File
@@ -344,12 +344,16 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->prefer_server_ciphers,
prev->prefer_server_ciphers, 1);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
src/os/unix/ngx_freebsd_config.h
+1 -1
View File
@@ -103,7 +103,7 @@ typedef struct aiocb ngx_aiocb_t;
#define NGX_LISTEN_BACKLOG -1
#ifdef __DragonFly__
#if (defined __DragonFly__ && __DragonFly_version < 500702)
#define NGX_KEEPALIVE_FACTOR 1000
#endif
src/stream/ngx_stream_proxy_module.c
+25 -2
View File
@@ -742,6 +742,25 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
u->state->peer = u->peer.name;
#if (NGX_STREAM_UPSTREAM_ZONE)
if (u->upstream && u->upstream->shm_zone
&& (u->upstream->flags & NGX_STREAM_UPSTREAM_MODIFY))
{
u->state->peer = ngx_palloc(s->connection->pool,
sizeof(ngx_str_t) + u->peer.name->len);
if (u->state->peer == NULL) {
ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
return;
}
u->state->peer->len = u->peer.name->len;
u->state->peer->data = (u_char *) (u->state->peer + 1);
ngx_memcpy(u->state->peer->data, u->peer.name->data, u->peer.name->len);
u->peer.name = u->state->peer;
}
#endif
if (rc == NGX_BUSY) {
ngx_log_error(NGX_LOG_ERR, c->log, 0, "no live upstreams");
ngx_stream_proxy_finalize(s, NGX_STREAM_BAD_GATEWAY);
@@ -2162,12 +2181,16 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->ssl_session_reuse,
prev->ssl_session_reuse, 1);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");
src/stream/ngx_stream_ssl_module.c
+6 -2
View File
@@ -882,12 +882,16 @@ ngx_stream_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->reject_handshake, prev->reject_handshake, 0);
#ifndef SSL_OP_NO_TLSv1_2
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
#ifndef SSL_OP_NO_TLSv1_2
|NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
#endif
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#else
ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
(NGX_CONF_BITMASK_SET
|NGX_SSL_TLSv1_2|NGX_SSL_TLSv1_3));
#endif
ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
src/stream/ngx_stream_upstream.c
+154 -1
View File
@@ -22,6 +22,11 @@ static char *ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd,
void *dummy);
static char *ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
#if (NGX_STREAM_UPSTREAM_ZONE)
static char *ngx_stream_upstream_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
#endif
static void *ngx_stream_upstream_create_main_conf(ngx_conf_t *cf);
static char *ngx_stream_upstream_init_main_conf(ngx_conf_t *cf, void *conf);
@@ -42,6 +47,24 @@ static ngx_command_t ngx_stream_upstream_commands[] = {
0,
NULL },
#if (NGX_STREAM_UPSTREAM_ZONE)
{ ngx_string("resolver"),
NGX_STREAM_UPS_CONF|NGX_CONF_1MORE,
ngx_stream_upstream_resolver,
NGX_STREAM_SRV_CONF_OFFSET,
0,
NULL },
{ ngx_string("resolver_timeout"),
NGX_STREAM_UPS_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_upstream_srv_conf_t, resolver_timeout),
NULL },
#endif
ngx_null_command
};
@@ -319,6 +342,7 @@ ngx_stream_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
u.no_port = 1;
uscf = ngx_stream_upstream_add(cf, &u, NGX_STREAM_UPSTREAM_CREATE
|NGX_STREAM_UPSTREAM_MODIFY
|NGX_STREAM_UPSTREAM_WEIGHT
|NGX_STREAM_UPSTREAM_MAX_CONNS
|NGX_STREAM_UPSTREAM_MAX_FAILS
@@ -408,6 +432,9 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_url_t u;
ngx_int_t weight, max_conns, max_fails;
ngx_uint_t i;
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_uint_t resolve;
#endif
ngx_stream_upstream_server_t *us;
us = ngx_array_push(uscf->servers);
@@ -423,6 +450,9 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
max_conns = 0;
max_fails = 1;
fail_timeout = 10;
#if (NGX_STREAM_UPSTREAM_ZONE)
resolve = 0;
#endif
for (i = 2; i < cf->args->nelts; i++) {
@@ -511,6 +541,26 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (ngx_strcmp(value[i].data, "resolve") == 0) {
resolve = 1;
continue;
}
if (ngx_strncmp(value[i].data, "service=", 8) == 0) {
us->service.len = value[i].len - 8;
us->service.data = &value[i].data[8];
if (us->service.len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "service is empty");
return NGX_CONF_ERROR;
}
continue;
}
#endif
goto invalid;
}
@@ -518,6 +568,22 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
u.url = value[1];
#if (NGX_STREAM_UPSTREAM_ZONE)
if (resolve) {
/* resolve at run time */
u.no_resolve = 1;
}
if (us->service.len && !resolve) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" requires "
"\"resolve\" parameter",
&u.url);
return NGX_CONF_ERROR;
}
#endif
if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
if (u.err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -527,15 +593,73 @@ ngx_stream_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
if (u.no_port) {
if (u.no_port
#if (NGX_STREAM_UPSTREAM_ZONE)
&& us->service.len == 0
#endif
)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"no port in upstream \"%V\"", &u.url);
return NGX_CONF_ERROR;
}
us->name = u.url;
#if (NGX_STREAM_UPSTREAM_ZONE)
if (us->service.len && !u.no_port) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" may not have port",
&us->name);
return NGX_CONF_ERROR;
}
if (us->service.len && u.naddrs) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"service upstream \"%V\" requires domain name",
&us->name);
return NGX_CONF_ERROR;
}
if (resolve && u.naddrs == 0) {
ngx_addr_t *addr;
/* save port */
addr = ngx_pcalloc(cf->pool, sizeof(ngx_addr_t));
if (addr == NULL) {
return NGX_CONF_ERROR;
}
addr->sockaddr = ngx_palloc(cf->pool, u.socklen);
if (addr->sockaddr == NULL) {
return NGX_CONF_ERROR;
}
ngx_memcpy(addr->sockaddr, &u.sockaddr, u.socklen);
addr->socklen = u.socklen;
us->addrs = addr;
us->naddrs = 1;
us->host = u.host;
} else {
us->addrs = u.addrs;
us->naddrs = u.naddrs;
}
#else
us->addrs = u.addrs;
us->naddrs = u.naddrs;
#endif
us->weight = weight;
us->max_conns = max_conns;
us->max_fails = max_fails;
@@ -560,6 +684,32 @@ not_supported:
}
#if (NGX_STREAM_UPSTREAM_ZONE)
static char *
ngx_stream_upstream_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_stream_upstream_srv_conf_t *uscf = conf;
ngx_str_t *value;
if (uscf->resolver) {
return "is duplicate";
}
value = cf->args->elts;
uscf->resolver = ngx_resolver_create(cf, &value[1], cf->args->nelts - 1);
if (uscf->resolver == NULL) {
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}
#endif
ngx_stream_upstream_srv_conf_t *
ngx_stream_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
{
@@ -638,6 +788,9 @@ ngx_stream_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
uscf->line = cf->conf_file->line;
uscf->port = u->port;
uscf->no_port = u->no_port;
#if (NGX_STREAM_UPSTREAM_ZONE)
uscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
#endif
if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) {
uscf->servers = ngx_array_create(cf->pool, 1,
src/stream/ngx_stream_upstream.h
+7 -2
View File
@@ -21,6 +21,7 @@
#define NGX_STREAM_UPSTREAM_FAIL_TIMEOUT 0x0008
#define NGX_STREAM_UPSTREAM_DOWN 0x0010
#define NGX_STREAM_UPSTREAM_BACKUP 0x0020
#define NGX_STREAM_UPSTREAM_MODIFY 0x0040
#define NGX_STREAM_UPSTREAM_MAX_CONNS 0x0100
@@ -62,8 +63,10 @@ typedef struct {
unsigned backup:1;
NGX_COMPAT_BEGIN(4)
NGX_COMPAT_END
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_str_t host;
ngx_str_t service;
#endif
} ngx_stream_upstream_server_t;
@@ -83,6 +86,8 @@ struct ngx_stream_upstream_srv_conf_s {
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_shm_zone_t *shm_zone;
ngx_resolver_t *resolver;
ngx_msec_t resolver_timeout;
#endif
};
src/stream/ngx_stream_upstream_hash_module.c
+80 -10
View File
@@ -23,6 +23,9 @@ typedef struct {
typedef struct {
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_uint_t config;
#endif
ngx_stream_complex_value_t key;
ngx_stream_upstream_chash_points_t *points;
} ngx_stream_upstream_hash_srv_conf_t;
@@ -49,6 +52,8 @@ static ngx_int_t ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc,
static ngx_int_t ngx_stream_upstream_init_chash(ngx_conf_t *cf,
ngx_stream_upstream_srv_conf_t *us);
static ngx_int_t ngx_stream_upstream_update_chash(ngx_pool_t *pool,
ngx_stream_upstream_srv_conf_t *us);
static int ngx_libc_cdecl
ngx_stream_upstream_chash_cmp_points(const void *one, const void *two);
static ngx_uint_t ngx_stream_upstream_find_chash_point(
@@ -178,11 +183,18 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
ngx_stream_upstream_rr_peers_rlock(hp->rrp.peers);
if (hp->tries > 20 || hp->rrp.peers->single || hp->key.len == 0) {
if (hp->tries > 20 || hp->rrp.peers->number < 2 || hp->key.len == 0) {
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
return hp->get_rr_peer(pc, &hp->rrp);
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (hp->rrp.peers->config && hp->rrp.config != *hp->rrp.peers->config) {
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
return hp->get_rr_peer(pc, &hp->rrp);
}
#endif
now = ngx_time();
pc->connection = NULL;
@@ -261,6 +273,7 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
}
hp->rrp.current = peer;
ngx_stream_upstream_rr_peer_ref(hp->rrp.peers, peer);
pc->sockaddr = peer->sockaddr;
pc->socklen = peer->socklen;
@@ -284,6 +297,26 @@ ngx_stream_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data)
static ngx_int_t
ngx_stream_upstream_init_chash(ngx_conf_t *cf,
ngx_stream_upstream_srv_conf_t *us)
{
if (ngx_stream_upstream_init_round_robin(cf, us) != NGX_OK) {
return NGX_ERROR;
}
us->peer.init = ngx_stream_upstream_init_chash_peer;
#if (NGX_STREAM_UPSTREAM_ZONE)
if (us->shm_zone) {
return NGX_OK;
}
#endif
return ngx_stream_upstream_update_chash(cf->pool, us);
}
static ngx_int_t
ngx_stream_upstream_update_chash(ngx_pool_t *pool,
ngx_stream_upstream_srv_conf_t *us)
{
u_char *host, *port, c;
size_t host_len, port_len, size;
@@ -299,25 +332,33 @@ ngx_stream_upstream_init_chash(ngx_conf_t *cf,
u_char byte[4];
} prev_hash;
if (ngx_stream_upstream_init_round_robin(cf, us) != NGX_OK) {
return NGX_ERROR;
}
hcf = ngx_stream_conf_upstream_srv_conf(us,
ngx_stream_upstream_hash_module);
us->peer.init = ngx_stream_upstream_init_chash_peer;
if (hcf->points) {
ngx_free(hcf->points);
hcf->points = NULL;
}
peers = us->peer.data;
npoints = peers->total_weight * 160;
size = sizeof(ngx_stream_upstream_chash_points_t)
+ sizeof(ngx_stream_upstream_chash_point_t) * (npoints - 1);
- sizeof(ngx_stream_upstream_chash_point_t)
+ sizeof(ngx_stream_upstream_chash_point_t) * npoints;
points = ngx_palloc(cf->pool, size);
points = pool ? ngx_palloc(pool, size) : ngx_alloc(size, ngx_cycle->log);
if (points == NULL) {
return NGX_ERROR;
}
points->number = 0;
if (npoints == 0) {
hcf->points = points;
return NGX_OK;
}
for (peer = peers->peer; peer; peer = peer->next) {
server = &peer->server;
@@ -401,8 +442,6 @@ ngx_stream_upstream_init_chash(ngx_conf_t *cf,
points->number = i + 1;
hcf = ngx_stream_conf_upstream_srv_conf(us,
ngx_stream_upstream_hash_module);
hcf->points = points;
return NGX_OK;
@@ -483,7 +522,22 @@ ngx_stream_upstream_init_chash_peer(ngx_stream_session_t *s,
ngx_stream_upstream_rr_peers_rlock(hp->rrp.peers);
hp->hash = ngx_stream_upstream_find_chash_point(hcf->points, hash);
#if (NGX_STREAM_UPSTREAM_ZONE)
if (hp->rrp.peers->config
&& (hcf->points == NULL || hcf->config != *hp->rrp.peers->config))
{
if (ngx_stream_upstream_update_chash(NULL, us) != NGX_OK) {
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_ERROR;
}
hcf->config = *hp->rrp.peers->config;
}
#endif
if (hcf->points->number) {
hp->hash = ngx_stream_upstream_find_chash_point(hcf->points, hash);
}
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
@@ -518,6 +572,20 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
pc->connection = NULL;
if (hp->rrp.peers->number == 0) {
pc->name = hp->rrp.peers->name;
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_BUSY;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (hp->rrp.peers->config && hp->rrp.config != *hp->rrp.peers->config) {
pc->name = hp->rrp.peers->name;
ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
return NGX_BUSY;
}
#endif
now = ngx_time();
hcf = hp->conf;
@@ -596,6 +664,7 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
}
hp->rrp.current = best;
ngx_stream_upstream_rr_peer_ref(hp->rrp.peers, best);
pc->sockaddr = best->sockaddr;
pc->socklen = best->socklen;
@@ -663,6 +732,7 @@ ngx_stream_upstream_hash(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
uscf->flags = NGX_STREAM_UPSTREAM_CREATE
|NGX_STREAM_UPSTREAM_MODIFY
|NGX_STREAM_UPSTREAM_WEIGHT
|NGX_STREAM_UPSTREAM_MAX_CONNS
|NGX_STREAM_UPSTREAM_MAX_FAILS
src/stream/ngx_stream_upstream_least_conn_module.c
+12
View File
@@ -120,6 +120,12 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
ngx_stream_upstream_rr_peers_wlock(peers);
#if (NGX_STREAM_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
goto busy;
}
#endif
best = NULL;
total = 0;
@@ -240,6 +246,7 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
best->conns++;
rrp->current = best;
ngx_stream_upstream_rr_peer_ref(peers, best);
n = p / (8 * sizeof(uintptr_t));
m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
@@ -276,6 +283,10 @@ failed:
ngx_stream_upstream_rr_peers_wlock(peers);
}
#if (NGX_STREAM_UPSTREAM_ZONE)
busy:
#endif
ngx_stream_upstream_rr_peers_unlock(peers);
pc->name = peers->name;
@@ -299,6 +310,7 @@ ngx_stream_upstream_least_conn(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf->peer.init_upstream = ngx_stream_upstream_init_least_conn;
uscf->flags = NGX_STREAM_UPSTREAM_CREATE
|NGX_STREAM_UPSTREAM_MODIFY
|NGX_STREAM_UPSTREAM_WEIGHT
|NGX_STREAM_UPSTREAM_MAX_CONNS
|NGX_STREAM_UPSTREAM_MAX_FAILS
src/stream/ngx_stream_upstream_random_module.c
+32 -3
View File
@@ -17,6 +17,9 @@ typedef struct {
typedef struct {
ngx_uint_t two;
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_uint_t config;
#endif
ngx_stream_upstream_random_range_t *ranges;
} ngx_stream_upstream_random_srv_conf_t;
@@ -125,6 +128,11 @@ ngx_stream_upstream_update_random(ngx_pool_t *pool,
rcf = ngx_stream_conf_upstream_srv_conf(us,
ngx_stream_upstream_random_module);
if (rcf->ranges) {
ngx_free(rcf->ranges);
rcf->ranges = NULL;
}
peers = us->peer.data;
size = peers->number * sizeof(ngx_stream_upstream_random_range_t);
@@ -186,11 +194,15 @@ ngx_stream_upstream_init_random_peer(ngx_stream_session_t *s,
ngx_stream_upstream_rr_peers_rlock(rp->rrp.peers);
#if (NGX_STREAM_UPSTREAM_ZONE)
if (rp->rrp.peers->shpool && rcf->ranges == NULL) {
if (rp->rrp.peers->config
&& (rcf->ranges == NULL || rcf->config != *rp->rrp.peers->config))
{
if (ngx_stream_upstream_update_random(NULL, us) != NGX_OK) {
ngx_stream_upstream_rr_peers_unlock(rp->rrp.peers);
return NGX_ERROR;
}
rcf->config = *rp->rrp.peers->config;
}
#endif
@@ -220,11 +232,18 @@ ngx_stream_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
ngx_stream_upstream_rr_peers_rlock(peers);
if (rp->tries > 20 || peers->single) {
if (rp->tries > 20 || peers->number < 2) {
ngx_stream_upstream_rr_peers_unlock(peers);
return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
ngx_stream_upstream_rr_peers_unlock(peers);
return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
}
#endif
pc->cached = 0;
pc->connection = NULL;
@@ -274,6 +293,7 @@ ngx_stream_upstream_get_random_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_stream_upstream_rr_peer_ref(peers, peer);
if (now - peer->checked > peer->fail_timeout) {
peer->checked = now;
@@ -314,11 +334,18 @@ ngx_stream_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
ngx_stream_upstream_rr_peers_wlock(peers);
if (rp->tries > 20 || peers->single) {
if (rp->tries > 20 || peers->number < 2) {
ngx_stream_upstream_rr_peers_unlock(peers);
return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
ngx_stream_upstream_rr_peers_unlock(peers);
return ngx_stream_upstream_get_round_robin_peer(pc, rrp);
}
#endif
pc->cached = 0;
pc->connection = NULL;
@@ -384,6 +411,7 @@ ngx_stream_upstream_get_random2_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_stream_upstream_rr_peer_ref(peers, peer);
if (now - peer->checked > peer->fail_timeout) {
peer->checked = now;
@@ -467,6 +495,7 @@ ngx_stream_upstream_random(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uscf->peer.init_upstream = ngx_stream_upstream_init_random;
uscf->flags = NGX_STREAM_UPSTREAM_CREATE
|NGX_STREAM_UPSTREAM_MODIFY
|NGX_STREAM_UPSTREAM_WEIGHT
|NGX_STREAM_UPSTREAM_MAX_CONNS
|NGX_STREAM_UPSTREAM_MAX_FAILS
src/stream/ngx_stream_upstream_round_robin.c
+204 -10
View File
@@ -38,10 +38,15 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
ngx_stream_upstream_srv_conf_t *us)
{
ngx_url_t u;
ngx_uint_t i, j, n, w, t;
ngx_uint_t i, j, n, r, w, t;
ngx_stream_upstream_server_t *server;
ngx_stream_upstream_rr_peer_t *peer, **peerp;
ngx_stream_upstream_rr_peers_t *peers, *backup;
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_uint_t resolve;
ngx_stream_core_srv_conf_t *cscf;
ngx_stream_upstream_rr_peer_t **rpeerp;
#endif
us->peer.init = ngx_stream_upstream_init_round_robin_peer;
@@ -49,14 +54,33 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
server = us->servers->elts;
n = 0;
r = 0;
w = 0;
t = 0;
#if (NGX_STREAM_UPSTREAM_ZONE)
resolve = 0;
#endif
for (i = 0; i < us->servers->nelts; i++) {
#if (NGX_STREAM_UPSTREAM_ZONE)
if (server[i].host.len) {
resolve = 1;
}
#endif
if (server[i].backup) {
continue;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (server[i].host.len) {
r++;
continue;
}
#endif
n += server[i].naddrs;
w += server[i].naddrs * server[i].weight;
@@ -65,7 +89,54 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
}
}
if (n == 0) {
#if (NGX_STREAM_UPSTREAM_ZONE)
if (us->shm_zone) {
if (resolve && !(us->flags & NGX_STREAM_UPSTREAM_MODIFY)) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"load balancing method does not support"
" resolving names at run time in"
" upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
cscf = ngx_stream_conf_get_module_srv_conf(cf,
ngx_stream_core_module);
if (us->resolver == NULL) {
us->resolver = cscf->resolver;
}
/*
* Without "resolver_timeout" in stream{} the merged value is unset.
*/
ngx_conf_merge_msec_value(us->resolver_timeout,
cscf->resolver_timeout, 30000);
if (resolve
&& (us->resolver == NULL
|| us->resolver->connections.nelts == 0))
{
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no resolver defined to resolve names"
" at run time in upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
} else if (resolve) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"resolving names at run time requires"
" upstream \"%V\" in %s:%ui"
" to be in shared memory",
&us->host, us->file_name, us->line);
return NGX_ERROR;
}
#endif
if (n + r == 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no servers in upstream \"%V\" in %s:%ui",
&us->host, us->file_name, us->line);
@@ -77,7 +148,8 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
return NGX_ERROR;
}
peer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_rr_peer_t) * n);
peer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_rr_peer_t)
* (n + r));
if (peer == NULL) {
return NGX_ERROR;
}
@@ -92,11 +164,46 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
n = 0;
peerp = &peers->peer;
#if (NGX_STREAM_UPSTREAM_ZONE)
rpeerp = &peers->resolve;
#endif
for (i = 0; i < us->servers->nelts; i++) {
if (server[i].backup) {
continue;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (server[i].host.len) {
peer[n].host = ngx_pcalloc(cf->pool,
sizeof(ngx_stream_upstream_host_t));
if (peer[n].host == NULL) {
return NGX_ERROR;
}
peer[n].host->name = server[i].host;
peer[n].host->service = server[i].service;
peer[n].sockaddr = server[i].addrs[0].sockaddr;
peer[n].socklen = server[i].addrs[0].socklen;
peer[n].name = server[i].addrs[0].name;
peer[n].weight = server[i].weight;
peer[n].effective_weight = server[i].weight;
peer[n].current_weight = 0;
peer[n].max_conns = server[i].max_conns;
peer[n].max_fails = server[i].max_fails;
peer[n].fail_timeout = server[i].fail_timeout;
peer[n].down = server[i].down;
peer[n].server = server[i].name;
*rpeerp = &peer[n];
rpeerp = &peer[n].next;
n++;
continue;
}
#endif
for (j = 0; j < server[i].naddrs; j++) {
peer[n].sockaddr = server[i].addrs[j].sockaddr;
peer[n].socklen = server[i].addrs[j].socklen;
@@ -121,6 +228,7 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
/* backup servers */
n = 0;
r = 0;
w = 0;
t = 0;
@@ -129,6 +237,13 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
continue;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (server[i].host.len) {
r++;
continue;
}
#endif
n += server[i].naddrs;
w += server[i].naddrs * server[i].weight;
@@ -137,7 +252,15 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
}
}
if (n == 0) {
if (n == 0
#if (NGX_STREAM_UPSTREAM_ZONE)
&& !resolve
#endif
) {
return NGX_OK;
}
if (n + r == 0 && !(us->flags & NGX_STREAM_UPSTREAM_BACKUP)) {
return NGX_OK;
}
@@ -146,12 +269,16 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
return NGX_ERROR;
}
peer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_rr_peer_t) * n);
peer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_upstream_rr_peer_t)
* (n + r));
if (peer == NULL) {
return NGX_ERROR;
}
peers->single = 0;
if (n > 0) {
peers->single = 0;
}
backup->single = 0;
backup->number = n;
backup->weighted = (w != n);
@@ -162,11 +289,46 @@ ngx_stream_upstream_init_round_robin(ngx_conf_t *cf,
n = 0;
peerp = &backup->peer;
#if (NGX_STREAM_UPSTREAM_ZONE)
rpeerp = &backup->resolve;
#endif
for (i = 0; i < us->servers->nelts; i++) {
if (!server[i].backup) {
continue;
}
#if (NGX_STREAM_UPSTREAM_ZONE)
if (server[i].host.len) {
peer[n].host = ngx_pcalloc(cf->pool,
sizeof(ngx_stream_upstream_host_t));
if (peer[n].host == NULL) {
return NGX_ERROR;
}
peer[n].host->name = server[i].host;
peer[n].host->service = server[i].service;
peer[n].sockaddr = server[i].addrs[0].sockaddr;
peer[n].socklen = server[i].addrs[0].socklen;
peer[n].name = server[i].addrs[0].name;
peer[n].weight = server[i].weight;
peer[n].effective_weight = server[i].weight;
peer[n].current_weight = 0;
peer[n].max_conns = server[i].max_conns;
peer[n].max_fails = server[i].max_fails;
peer[n].fail_timeout = server[i].fail_timeout;
peer[n].down = server[i].down;
peer[n].server = server[i].name;
*rpeerp = &peer[n];
rpeerp = &peer[n].next;
n++;
continue;
}
#endif
for (j = 0; j < server[i].naddrs; j++) {
peer[n].sockaddr = server[i].addrs[j].sockaddr;
peer[n].socklen = server[i].addrs[j].socklen;
@@ -280,7 +442,12 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
rrp->peers = us->peer.data;
rrp->current = NULL;
rrp->config = 0;
ngx_stream_upstream_rr_peers_rlock(rrp->peers);
#if (NGX_STREAM_UPSTREAM_ZONE)
rrp->config = rrp->peers->config ? *rrp->peers->config : 0;
#endif
n = rrp->peers->number;
@@ -288,6 +455,10 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
n = rrp->peers->next->number;
}
s->upstream->peer.tries = ngx_stream_upstream_tries(rrp->peers);
ngx_stream_upstream_rr_peers_unlock(rrp->peers);
if (n <= 8 * sizeof(uintptr_t)) {
rrp->tried = &rrp->data;
rrp->data = 0;
@@ -304,7 +475,7 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
s->upstream->peer.get = ngx_stream_upstream_get_round_robin_peer;
s->upstream->peer.free = ngx_stream_upstream_free_round_robin_peer;
s->upstream->peer.notify = ngx_stream_upstream_notify_round_robin_peer;
s->upstream->peer.tries = ngx_stream_upstream_tries(rrp->peers);
#if (NGX_STREAM_SSL)
s->upstream->peer.set_session =
ngx_stream_upstream_set_round_robin_peer_session;
@@ -455,6 +626,12 @@ ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
peers = rrp->peers;
ngx_stream_upstream_rr_peers_wlock(peers);
#if (NGX_STREAM_UPSTREAM_ZONE)
if (peers->config && rrp->config != *peers->config) {
goto busy;
}
#endif
if (peers->single) {
peer = peers->peer;
@@ -467,6 +644,7 @@ ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
}
rrp->current = peer;
ngx_stream_upstream_rr_peer_ref(peers, peer);
} else {
@@ -519,6 +697,10 @@ failed:
ngx_stream_upstream_rr_peers_wlock(peers);
}
#if (NGX_STREAM_UPSTREAM_ZONE)
busy:
#endif
ngx_stream_upstream_rr_peers_unlock(peers);
pc->name = peers->name;
@@ -589,6 +771,7 @@ ngx_stream_upstream_get_peer(ngx_stream_upstream_rr_peer_data_t *rrp)
}
rrp->current = best;
ngx_stream_upstream_rr_peer_ref(rrp->peers, best);
n = p / (8 * sizeof(uintptr_t));
m = (uintptr_t) 1 << p % (8 * sizeof(uintptr_t));
@@ -623,9 +806,17 @@ ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
ngx_stream_upstream_rr_peer_lock(rrp->peers, peer);
if (rrp->peers->single) {
if (peer->fails) {
peer->fails = 0;
}
peer->conns--;
ngx_stream_upstream_rr_peer_unlock(rrp->peers, peer);
if (ngx_stream_upstream_rr_peer_unref(rrp->peers, peer) == NGX_OK) {
ngx_stream_upstream_rr_peer_unlock(rrp->peers, peer);
}
ngx_stream_upstream_rr_peers_unlock(rrp->peers);
pc->tries = 0;
@@ -667,7 +858,10 @@ ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
peer->conns--;
ngx_stream_upstream_rr_peer_unlock(rrp->peers, peer);
if (ngx_stream_upstream_rr_peer_unref(rrp->peers, peer) == NGX_OK) {
ngx_stream_upstream_rr_peer_unlock(rrp->peers, peer);
}
ngx_stream_upstream_rr_peers_unlock(rrp->peers);
if (pc->tries) {
src/stream/ngx_stream_upstream_round_robin.h
+85 -3
View File
@@ -14,8 +14,25 @@
#include <ngx_stream.h>
typedef struct ngx_stream_upstream_rr_peers_s ngx_stream_upstream_rr_peers_t;
typedef struct ngx_stream_upstream_rr_peer_s ngx_stream_upstream_rr_peer_t;
#if (NGX_STREAM_UPSTREAM_ZONE)
typedef struct {
ngx_event_t event; /* must be first */
ngx_uint_t worker;
ngx_str_t name;
ngx_str_t service;
time_t valid;
ngx_stream_upstream_rr_peers_t *peers;
ngx_stream_upstream_rr_peer_t *peer;
} ngx_stream_upstream_host_t;
#endif
struct ngx_stream_upstream_rr_peer_s {
struct sockaddr *sockaddr;
socklen_t socklen;
@@ -44,24 +61,28 @@ struct ngx_stream_upstream_rr_peer_s {
int ssl_session_len;
#if (NGX_STREAM_UPSTREAM_ZONE)
unsigned zombie:1;
ngx_atomic_t lock;
ngx_uint_t refs;
ngx_stream_upstream_host_t *host;
#endif
ngx_stream_upstream_rr_peer_t *next;
NGX_COMPAT_BEGIN(25)
NGX_COMPAT_BEGIN(14)
NGX_COMPAT_END
};
typedef struct ngx_stream_upstream_rr_peers_s ngx_stream_upstream_rr_peers_t;
struct ngx_stream_upstream_rr_peers_s {
ngx_uint_t number;
#if (NGX_STREAM_UPSTREAM_ZONE)
ngx_slab_pool_t *shpool;
ngx_atomic_t rwlock;
ngx_uint_t *config;
ngx_stream_upstream_rr_peer_t *resolve;
ngx_stream_upstream_rr_peers_t *zone_next;
#endif
@@ -112,6 +133,65 @@ struct ngx_stream_upstream_rr_peers_s {
ngx_rwlock_unlock(&peer->lock); \
}
#define ngx_stream_upstream_rr_peer_ref(peers, peer) \
(peer)->refs++;
static ngx_inline void
ngx_stream_upstream_rr_peer_free_locked(ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *peer)
{
if (peer->refs) {
peer->zombie = 1;
return;
}
ngx_slab_free_locked(peers->shpool, peer->sockaddr);
ngx_slab_free_locked(peers->shpool, peer->name.data);
if (peer->server.data) {
ngx_slab_free_locked(peers->shpool, peer->server.data);
}
#if (NGX_STREAM_SSL)
if (peer->ssl_session) {
ngx_slab_free_locked(peers->shpool, peer->ssl_session);
}
#endif
ngx_slab_free_locked(peers->shpool, peer);
}
static ngx_inline void
ngx_stream_upstream_rr_peer_free(ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *peer)
{
ngx_shmtx_lock(&peers->shpool->mutex);
ngx_stream_upstream_rr_peer_free_locked(peers, peer);
ngx_shmtx_unlock(&peers->shpool->mutex);
}
static ngx_inline ngx_int_t
ngx_stream_upstream_rr_peer_unref(ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *peer)
{
peer->refs--;
if (peers->shpool == NULL) {
return NGX_OK;
}
if (peer->refs == 0 && peer->zombie) {
ngx_stream_upstream_rr_peer_free(peers, peer);
return NGX_DONE;
}
return NGX_OK;
}
#else
#define ngx_stream_upstream_rr_peers_rlock(peers)
@@ -119,6 +199,8 @@ struct ngx_stream_upstream_rr_peers_s {
#define ngx_stream_upstream_rr_peers_unlock(peers)
#define ngx_stream_upstream_rr_peer_lock(peers, peer)
#define ngx_stream_upstream_rr_peer_unlock(peers, peer)
#define ngx_stream_upstream_rr_peer_ref(peers, peer)
#define ngx_stream_upstream_rr_peer_unref(peers, peer) NGX_OK
#endif
src/stream/ngx_stream_upstream_zone_module.c
+691 -8
View File
@@ -15,9 +15,22 @@ static char *ngx_stream_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd,
static ngx_int_t ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone,
void *data);
static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers(
ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf);
ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf,
ngx_stream_upstream_srv_conf_t *ouscf);
static ngx_stream_upstream_rr_peer_t *ngx_stream_upstream_zone_copy_peer(
ngx_stream_upstream_rr_peers_t *peers, ngx_stream_upstream_rr_peer_t *src);
static ngx_int_t ngx_stream_upstream_zone_preresolve(
ngx_stream_upstream_rr_peer_t *resolve,
ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *oresolve,
ngx_stream_upstream_rr_peers_t *opeers);
static void ngx_stream_upstream_zone_set_single(
ngx_stream_upstream_srv_conf_t *uscf);
static void ngx_stream_upstream_zone_remove_peer_locked(
ngx_stream_upstream_rr_peers_t *peers, ngx_stream_upstream_rr_peer_t *peer);
static ngx_int_t ngx_stream_upstream_zone_init_worker(ngx_cycle_t *cycle);
static void ngx_stream_upstream_zone_resolve_timer(ngx_event_t *event);
static void ngx_stream_upstream_zone_resolve_handler(ngx_resolver_ctx_t *ctx);
static ngx_command_t ngx_stream_upstream_zone_commands[] = {
@@ -52,7 +65,7 @@ ngx_module_t ngx_stream_upstream_zone_module = {
NGX_STREAM_MODULE, /* module type */
NULL, /* init master */
NULL, /* init module */
NULL, /* init process */
ngx_stream_upstream_zone_init_worker, /* init process */
NULL, /* init thread */
NULL, /* exit thread */
NULL, /* exit process */
@@ -118,11 +131,11 @@ static ngx_int_t
ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
{
size_t len;
ngx_uint_t i;
ngx_uint_t i, j;
ngx_slab_pool_t *shpool;
ngx_stream_upstream_rr_peers_t *peers, **peersp;
ngx_stream_upstream_srv_conf_t *uscf, **uscfp;
ngx_stream_upstream_main_conf_t *umcf;
ngx_stream_upstream_srv_conf_t *uscf, *ouscf, **uscfp, **ouscfp;
ngx_stream_upstream_main_conf_t *umcf, *oumcf;
shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
umcf = shm_zone->data;
@@ -159,6 +172,7 @@ ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
/* copy peers to shared memory */
peersp = (ngx_stream_upstream_rr_peers_t **) (void *) &shpool->data;
oumcf = data;
for (i = 0; i < umcf->upstreams.nelts; i++) {
uscf = uscfp[i];
@@ -167,7 +181,38 @@ ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
continue;
}
peers = ngx_stream_upstream_zone_copy_peers(shpool, uscf);
ouscf = NULL;
if (oumcf) {
ouscfp = oumcf->upstreams.elts;
for (j = 0; j < oumcf->upstreams.nelts; j++) {
if (ouscfp[j]->shm_zone == NULL) {
continue;
}
if (ouscfp[j]->shm_zone->shm.name.len != shm_zone->shm.name.len
|| ngx_memcmp(ouscfp[j]->shm_zone->shm.name.data,
shm_zone->shm.name.data,
shm_zone->shm.name.len)
!= 0)
{
continue;
}
if (ouscfp[j]->host.len == uscf->host.len
&& ngx_memcmp(ouscfp[j]->host.data, uscf->host.data,
uscf->host.len)
== 0)
{
ouscf = ouscfp[j];
break;
}
}
}
peers = ngx_stream_upstream_zone_copy_peers(shpool, uscf, ouscf);
if (peers == NULL) {
return NGX_ERROR;
}
@@ -182,11 +227,19 @@ ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
static ngx_stream_upstream_rr_peers_t *
ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
ngx_stream_upstream_srv_conf_t *uscf)
ngx_stream_upstream_srv_conf_t *uscf, ngx_stream_upstream_srv_conf_t *ouscf)
{
ngx_str_t *name;
ngx_uint_t *config;
ngx_stream_upstream_rr_peer_t *peer, **peerp;
ngx_stream_upstream_rr_peers_t *peers, *backup;
ngx_stream_upstream_rr_peers_t *peers, *opeers, *backup;
opeers = (ouscf ? ouscf->peer.data : NULL);
config = ngx_slab_calloc(shpool, sizeof(ngx_uint_t));
if (config == NULL) {
return NULL;
}
peers = ngx_slab_alloc(shpool, sizeof(ngx_stream_upstream_rr_peers_t));
if (peers == NULL) {
@@ -211,6 +264,7 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
peers->name = name;
peers->shpool = shpool;
peers->config = config;
for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
@@ -220,6 +274,27 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
}
*peerp = peer;
(*peers->config)++;
}
for (peerp = &peers->resolve; *peerp; peerp = &peer->next) {
peer = ngx_stream_upstream_zone_copy_peer(peers, *peerp);
if (peer == NULL) {
return NULL;
}
*peerp = peer;
(*peers->config)++;
}
if (opeers) {
if (ngx_stream_upstream_zone_preresolve(peers->resolve, peers,
opeers->resolve, opeers)
!= NGX_OK)
{
return NULL;
}
}
if (peers->next == NULL) {
@@ -236,6 +311,7 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
backup->name = name;
backup->shpool = shpool;
backup->config = config;
for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
@@ -245,14 +321,45 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
}
*peerp = peer;
(*backup->config)++;
}
for (peerp = &backup->resolve; *peerp; peerp = &peer->next) {
peer = ngx_stream_upstream_zone_copy_peer(backup, *peerp);
if (peer == NULL) {
return NULL;
}
*peerp = peer;
(*backup->config)++;
}
peers->next = backup;
if (opeers && opeers->next) {
if (ngx_stream_upstream_zone_preresolve(peers->resolve, backup,
opeers->resolve, opeers->next)
!= NGX_OK)
{
return NULL;
}
if (ngx_stream_upstream_zone_preresolve(backup->resolve, backup,
opeers->next->resolve,
opeers->next)
!= NGX_OK)
{
return NULL;
}
}
done:
uscf->peer.data = peers;
ngx_stream_upstream_zone_set_single(uscf);
return peers;
}
@@ -276,6 +383,7 @@ ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers,
dst->sockaddr = NULL;
dst->name.data = NULL;
dst->server.data = NULL;
dst->host = NULL;
}
dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t));
@@ -298,12 +406,53 @@ ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers,
}
ngx_memcpy(dst->server.data, src->server.data, src->server.len);
if (src->host) {
dst->host = ngx_slab_calloc_locked(pool,
sizeof(ngx_stream_upstream_host_t));
if (dst->host == NULL) {
goto failed;
}
dst->host->name.data = ngx_slab_alloc_locked(pool,
src->host->name.len);
if (dst->host->name.data == NULL) {
goto failed;
}
dst->host->peers = peers;
dst->host->peer = dst;
dst->host->name.len = src->host->name.len;
ngx_memcpy(dst->host->name.data, src->host->name.data,
src->host->name.len);
if (src->host->service.len) {
dst->host->service.data = ngx_slab_alloc_locked(pool,
src->host->service.len);
if (dst->host->service.data == NULL) {
goto failed;
}
dst->host->service.len = src->host->service.len;
ngx_memcpy(dst->host->service.data, src->host->service.data,
src->host->service.len);
}
}
}
return dst;
failed:
if (dst->host) {
if (dst->host->name.data) {
ngx_slab_free_locked(pool, dst->host->name.data);
}
ngx_slab_free_locked(pool, dst->host);
}
if (dst->server.data) {
ngx_slab_free_locked(pool, dst->server.data);
}
@@ -320,3 +469,537 @@ failed:
return NULL;
}
static ngx_int_t
ngx_stream_upstream_zone_preresolve(ngx_stream_upstream_rr_peer_t *resolve,
ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *oresolve,
ngx_stream_upstream_rr_peers_t *opeers)
{
in_port_t port;
ngx_str_t *server;
ngx_stream_upstream_host_t *host;
ngx_stream_upstream_rr_peer_t *peer, *template, *opeer, **peerp;
if (resolve == NULL || oresolve == NULL) {
return NGX_OK;
}
for (peerp = &peers->peer; *peerp; peerp = &(*peerp)->next) {
/* void */
}
ngx_stream_upstream_rr_peers_rlock(opeers);
for (template = resolve; template; template = template->next) {
for (opeer = oresolve; opeer; opeer = opeer->next) {
if (opeer->host->name.len != template->host->name.len
|| ngx_memcmp(opeer->host->name.data,
template->host->name.data,
template->host->name.len)
!= 0)
{
continue;
}
if (opeer->host->service.len != template->host->service.len
|| ngx_memcmp(opeer->host->service.data,
template->host->service.data,
template->host->service.len)
!= 0)
{
continue;
}
host = opeer->host;
for (opeer = opeers->peer; opeer; opeer = opeer->next) {
if (opeer->host != host) {
continue;
}
peer = ngx_stream_upstream_zone_copy_peer(peers, NULL);
if (peer == NULL) {
ngx_stream_upstream_rr_peers_unlock(opeers);
return NGX_ERROR;
}
ngx_memcpy(peer->sockaddr, opeer->sockaddr, opeer->socklen);
if (template->host->service.len == 0) {
port = ngx_inet_get_port(template->sockaddr);
ngx_inet_set_port(peer->sockaddr, port);
}
peer->socklen = opeer->socklen;
peer->name.len = ngx_sock_ntop(peer->sockaddr, peer->socklen,
peer->name.data,
NGX_SOCKADDR_STRLEN, 1);
peer->host = template->host;
template->host->valid = host->valid;
server = template->host->service.len ? &opeer->server
: &template->server;
peer->server.data = ngx_slab_alloc(peers->shpool, server->len);
if (peer->server.data == NULL) {
ngx_stream_upstream_rr_peers_unlock(opeers);
return NGX_ERROR;
}
ngx_memcpy(peer->server.data, server->data, server->len);
peer->server.len = server->len;
if (host->service.len == 0) {
peer->weight = template->weight;
} else {
peer->weight = (template->weight != 1 ? template->weight
: opeer->weight);
}
peer->effective_weight = peer->weight;
peer->max_conns = template->max_conns;
peer->max_fails = template->max_fails;
peer->fail_timeout = template->fail_timeout;
peer->down = template->down;
(*peers->config)++;
*peerp = peer;
peerp = &peer->next;
peers->number++;
peers->tries += (peer->down == 0);
peers->total_weight += peer->weight;
peers->weighted = (peers->total_weight != peers->number);
}
break;
}
}
ngx_stream_upstream_rr_peers_unlock(opeers);
return NGX_OK;
}
static void
ngx_stream_upstream_zone_set_single(ngx_stream_upstream_srv_conf_t *uscf)
{
ngx_stream_upstream_rr_peers_t *peers;
peers = uscf->peer.data;
if (peers->number == 1
&& (peers->next == NULL || peers->next->number == 0))
{
peers->single = 1;
} else {
peers->single = 0;
}
}
static void
ngx_stream_upstream_zone_remove_peer_locked(
ngx_stream_upstream_rr_peers_t *peers, ngx_stream_upstream_rr_peer_t *peer)
{
peers->total_weight -= peer->weight;
peers->number--;
peers->tries -= (peer->down == 0);
(*peers->config)++;
peers->weighted = (peers->total_weight != peers->number);
ngx_stream_upstream_rr_peer_free(peers, peer);
}
static ngx_int_t
ngx_stream_upstream_zone_init_worker(ngx_cycle_t *cycle)
{
time_t now;
ngx_msec_t timer;
ngx_uint_t i;
ngx_event_t *event;
ngx_stream_upstream_rr_peer_t *peer;
ngx_stream_upstream_rr_peers_t *peers;
ngx_stream_upstream_srv_conf_t *uscf, **uscfp;
ngx_stream_upstream_main_conf_t *umcf;
if (ngx_process != NGX_PROCESS_WORKER
&& ngx_process != NGX_PROCESS_SINGLE)
{
return NGX_OK;
}
now = ngx_time();
umcf = ngx_stream_cycle_get_module_main_conf(cycle,
ngx_stream_upstream_module);
if (umcf == NULL) {
return NGX_OK;
}
uscfp = umcf->upstreams.elts;
for (i = 0; i < umcf->upstreams.nelts; i++) {
uscf = uscfp[i];
if (uscf->shm_zone == NULL) {
continue;
}
peers = uscf->peer.data;
do {
ngx_stream_upstream_rr_peers_wlock(peers);
for (peer = peers->resolve; peer; peer = peer->next) {
if (peer->host->worker != ngx_worker) {
continue;
}
event = &peer->host->event;
ngx_memzero(event, sizeof(ngx_event_t));
event->data = uscf;
event->handler = ngx_stream_upstream_zone_resolve_timer;
event->log = cycle->log;
event->cancelable = 1;
timer = (peer->host->valid > now)
? (ngx_msec_t) 1000 * (peer->host->valid - now) : 1;
ngx_add_timer(event, timer);
}
ngx_stream_upstream_rr_peers_unlock(peers);
peers = peers->next;
} while (peers);
}
return NGX_OK;
}
static void
ngx_stream_upstream_zone_resolve_timer(ngx_event_t *event)
{
ngx_resolver_ctx_t *ctx;
ngx_stream_upstream_host_t *host;
ngx_stream_upstream_srv_conf_t *uscf;
host = (ngx_stream_upstream_host_t *) event;
uscf = event->data;
ctx = ngx_resolve_start(uscf->resolver, NULL);
if (ctx == NULL) {
goto retry;
}
if (ctx == NGX_NO_RESOLVER) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"no resolver defined to resolve %V", &host->name);
return;
}
ctx->name = host->name;
ctx->handler = ngx_stream_upstream_zone_resolve_handler;
ctx->data = host;
ctx->timeout = uscf->resolver_timeout;
ctx->service = host->service;
ctx->cancelable = 1;
if (ngx_resolve_name(ctx) == NGX_OK) {
return;
}
retry:
ngx_add_timer(event, ngx_max(uscf->resolver_timeout, 1000));
}
#define ngx_stream_upstream_zone_addr_marked(addr) \
((uintptr_t) (addr)->sockaddr & 1)
#define ngx_stream_upstream_zone_mark_addr(addr) \
(addr)->sockaddr = (struct sockaddr *) ((uintptr_t) (addr)->sockaddr | 1)
#define ngx_stream_upstream_zone_unmark_addr(addr) \
(addr)->sockaddr = \
(struct sockaddr *) ((uintptr_t) (addr)->sockaddr & ~((uintptr_t) 1))
static void
ngx_stream_upstream_zone_resolve_handler(ngx_resolver_ctx_t *ctx)
{
time_t now;
u_short min_priority;
in_port_t port;
ngx_str_t *server;
ngx_msec_t timer;
ngx_uint_t i, j, backup, addr_backup;
ngx_event_t *event;
ngx_resolver_addr_t *addr;
ngx_resolver_srv_name_t *srv;
ngx_stream_upstream_host_t *host;
ngx_stream_upstream_rr_peer_t *peer, *template, **peerp;
ngx_stream_upstream_rr_peers_t *peers;
ngx_stream_upstream_srv_conf_t *uscf;
host = ctx->data;
event = &host->event;
uscf = event->data;
peers = host->peers;
template = host->peer;
ngx_stream_upstream_rr_peers_wlock(peers);
now = ngx_time();
for (i = 0; i < ctx->nsrvs; i++) {
srv = &ctx->srvs[i];
if (srv->state) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"%V could not be resolved (%i: %s) "
"while resolving service %V of %V",
&srv->name, srv->state,
ngx_resolver_strerror(srv->state), &ctx->service,
&ctx->name);
}
}
if (ctx->state) {
if (ctx->service.len) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"service %V of %V could not be resolved (%i: %s)",
&ctx->service, &ctx->name, ctx->state,
ngx_resolver_strerror(ctx->state));
} else {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"%V could not be resolved (%i: %s)",
&ctx->name, ctx->state,
ngx_resolver_strerror(ctx->state));
}
if (ctx->state != NGX_RESOLVE_NXDOMAIN) {
ngx_stream_upstream_rr_peers_unlock(peers);
ngx_resolve_name_done(ctx);
ngx_add_timer(event, ngx_max(uscf->resolver_timeout, 1000));
return;
}
/* NGX_RESOLVE_NXDOMAIN */
ctx->naddrs = 0;
}
backup = 0;
min_priority = 65535;
for (i = 0; i < ctx->naddrs; i++) {
min_priority = ngx_min(ctx->addrs[i].priority, min_priority);
}
#if (NGX_DEBUG)
{
u_char text[NGX_SOCKADDR_STRLEN];
size_t len;
for (i = 0; i < ctx->naddrs; i++) {
len = ngx_sock_ntop(ctx->addrs[i].sockaddr, ctx->addrs[i].socklen,
text, NGX_SOCKADDR_STRLEN, 1);
ngx_log_debug7(NGX_LOG_DEBUG_STREAM, event->log, 0,
"name %V was resolved to %*s "
"s:\"%V\" n:\"%V\" w:%d %s",
&host->name, len, text, &host->service,
&ctx->addrs[i].name, ctx->addrs[i].weight,
ctx->addrs[i].priority != min_priority ? "backup" : "");
}
}
#endif
again:
for (peerp = &peers->peer; *peerp; /* void */ ) {
peer = *peerp;
if (peer->host != host) {
goto next;
}
for (j = 0; j < ctx->naddrs; j++) {
addr = &ctx->addrs[j];
addr_backup = (addr->priority != min_priority);
if (addr_backup != backup) {
continue;
}
if (ngx_stream_upstream_zone_addr_marked(addr)) {
continue;
}
if (ngx_cmp_sockaddr(peer->sockaddr, peer->socklen,
addr->sockaddr, addr->socklen,
host->service.len != 0)
!= NGX_OK)
{
continue;
}
if (host->service.len) {
if (addr->name.len != peer->server.len
|| ngx_strncmp(addr->name.data, peer->server.data,
addr->name.len))
{
continue;
}
if (template->weight == 1 && addr->weight != peer->weight) {
continue;
}
}
ngx_stream_upstream_zone_mark_addr(addr);
goto next;
}
*peerp = peer->next;
ngx_stream_upstream_zone_remove_peer_locked(peers, peer);
ngx_stream_upstream_zone_set_single(uscf);
continue;
next:
peerp = &peer->next;
}
for (i = 0; i < ctx->naddrs; i++) {
addr = &ctx->addrs[i];
addr_backup = (addr->priority != min_priority);
if (addr_backup != backup) {
continue;
}
if (ngx_stream_upstream_zone_addr_marked(addr)) {
ngx_stream_upstream_zone_unmark_addr(addr);
continue;
}
ngx_shmtx_lock(&peers->shpool->mutex);
peer = ngx_stream_upstream_zone_copy_peer(peers, NULL);
ngx_shmtx_unlock(&peers->shpool->mutex);
if (peer == NULL) {
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"cannot add new server to upstream \"%V\", "
"memory exhausted", peers->name);
goto done;
}
ngx_memcpy(peer->sockaddr, addr->sockaddr, addr->socklen);
if (host->service.len == 0) {
port = ngx_inet_get_port(template->sockaddr);
ngx_inet_set_port(peer->sockaddr, port);
}
peer->socklen = addr->socklen;
peer->name.len = ngx_sock_ntop(peer->sockaddr, peer->socklen,
peer->name.data, NGX_SOCKADDR_STRLEN, 1);
peer->host = template->host;
server = host->service.len ? &addr->name : &template->server;
peer->server.data = ngx_slab_alloc(peers->shpool, server->len);
if (peer->server.data == NULL) {
ngx_stream_upstream_rr_peer_free(peers, peer);
ngx_log_error(NGX_LOG_ERR, event->log, 0,
"cannot add new server to upstream \"%V\", "
"memory exhausted", peers->name);
goto done;
}
peer->server.len = server->len;
ngx_memcpy(peer->server.data, server->data, server->len);
if (host->service.len == 0) {
peer->weight = template->weight;
} else {
peer->weight = (template->weight != 1 ? template->weight
: addr->weight);
}
peer->effective_weight = peer->weight;
peer->max_conns = template->max_conns;
peer->max_fails = template->max_fails;
peer->fail_timeout = template->fail_timeout;
peer->down = template->down;
*peerp = peer;
peerp = &peer->next;
peers->number++;
peers->tries += (peer->down == 0);
peers->total_weight += peer->weight;
peers->weighted = (peers->total_weight != peers->number);
(*peers->config)++;
ngx_stream_upstream_zone_set_single(uscf);
}
if (host->service.len && peers->next) {
ngx_stream_upstream_rr_peers_unlock(peers);
peers = peers->next;
backup = 1;
ngx_stream_upstream_rr_peers_wlock(peers);
goto again;
}
done:
host->valid = ctx->valid;
ngx_stream_upstream_rr_peers_unlock(peers);
while (++i < ctx->naddrs) {
ngx_stream_upstream_zone_unmark_addr(&ctx->addrs[i]);
}
timer = (ngx_msec_t) 1000 * (ctx->valid > now ? ctx->valid - now + 1 : 1);
ngx_resolve_name_done(ctx);
ngx_add_timer(event, timer);
}