Mercurial > hg > nginx
annotate src/http/modules/ngx_http_upstream_zone_module.c @ 6169:f654addf0eea
Stream: fixed "reuseport" to actually work.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Fri, 05 Jun 2015 23:03:13 +0300 |
| parents | caa103acf180 |
| children | 311d232ad803 |
| rev | line source |
|---|---|
| 6103 | 1 |
| 2 /* | |
| 3 * Copyright (C) Ruslan Ermilov | |
| 4 * Copyright (C) Nginx, Inc. | |
| 5 */ | |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
| 13 static char *ngx_http_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 14 void *conf); | |
| 15 static ngx_int_t ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, | |
| 16 void *data); | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
17 static ngx_int_t ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool, |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
18 ngx_http_upstream_srv_conf_t *uscf); |
| 6103 | 19 |
| 20 | |
| 21 static ngx_command_t ngx_http_upstream_zone_commands[] = { | |
| 22 | |
| 23 { ngx_string("zone"), | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
24 NGX_HTTP_UPS_CONF|NGX_CONF_TAKE12, |
| 6103 | 25 ngx_http_upstream_zone, |
| 26 0, | |
| 27 0, | |
| 28 NULL }, | |
| 29 | |
| 30 ngx_null_command | |
| 31 }; | |
| 32 | |
| 33 | |
| 34 static ngx_http_module_t ngx_http_upstream_zone_module_ctx = { | |
| 35 NULL, /* preconfiguration */ | |
| 36 NULL, /* postconfiguration */ | |
| 37 | |
| 38 NULL, /* create main configuration */ | |
| 39 NULL, /* init main configuration */ | |
| 40 | |
| 41 NULL, /* create server configuration */ | |
| 42 NULL, /* merge server configuration */ | |
| 43 | |
| 44 NULL, /* create location configuration */ | |
| 45 NULL /* merge location configuration */ | |
| 46 }; | |
| 47 | |
| 48 | |
| 49 ngx_module_t ngx_http_upstream_zone_module = { | |
| 50 NGX_MODULE_V1, | |
| 51 &ngx_http_upstream_zone_module_ctx, /* module context */ | |
| 52 ngx_http_upstream_zone_commands, /* module directives */ | |
| 53 NGX_HTTP_MODULE, /* module type */ | |
| 54 NULL, /* init master */ | |
| 55 NULL, /* init module */ | |
| 56 NULL, /* init process */ | |
| 57 NULL, /* init thread */ | |
| 58 NULL, /* exit thread */ | |
| 59 NULL, /* exit process */ | |
| 60 NULL, /* exit master */ | |
| 61 NGX_MODULE_V1_PADDING | |
| 62 }; | |
| 63 | |
| 64 | |
| 65 static char * | |
| 66 ngx_http_upstream_zone(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 67 { | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
68 ssize_t size; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
69 ngx_str_t *value; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
70 ngx_http_upstream_srv_conf_t *uscf; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
71 ngx_http_upstream_main_conf_t *umcf; |
| 6103 | 72 |
| 73 uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module); | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
74 umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_upstream_module); |
| 6103 | 75 |
| 76 value = cf->args->elts; | |
| 77 | |
| 78 if (!value[1].len) { | |
| 79 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 80 "invalid zone name \"%V\"", &value[1]); | |
| 81 return NGX_CONF_ERROR; | |
| 82 } | |
| 83 | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
84 if (cf->args->nelts == 3) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
85 size = ngx_parse_size(&value[2]); |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
86 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
87 if (size == NGX_ERROR) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
88 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
89 "invalid zone size \"%V\"", &value[2]); |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
90 return NGX_CONF_ERROR; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
91 } |
| 6103 | 92 |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
93 if (size < (ssize_t) (8 * ngx_pagesize)) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
94 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
95 "zone \"%V\" is too small", &value[1]); |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
96 return NGX_CONF_ERROR; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
97 } |
| 6103 | 98 |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
99 } else { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
100 size = 0; |
| 6103 | 101 } |
| 102 | |
| 103 uscf->shm_zone = ngx_shared_memory_add(cf, &value[1], size, | |
| 104 &ngx_http_upstream_module); | |
| 105 if (uscf->shm_zone == NULL) { | |
| 106 return NGX_CONF_ERROR; | |
| 107 } | |
| 108 | |
| 109 uscf->shm_zone->init = ngx_http_upstream_init_zone; | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
110 uscf->shm_zone->data = umcf; |
| 6103 | 111 |
| 112 uscf->shm_zone->noreuse = 1; | |
| 113 | |
| 114 return NGX_CONF_OK; | |
| 115 } | |
| 116 | |
| 117 | |
| 118 static ngx_int_t | |
| 119 ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data) | |
| 120 { | |
| 121 size_t len; | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
122 ngx_uint_t i; |
| 6103 | 123 ngx_slab_pool_t *shpool; |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
124 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
125 ngx_http_upstream_main_conf_t *umcf; |
| 6103 | 126 |
| 127 shpool = (ngx_slab_pool_t *) shm_zone->shm.addr; | |
| 128 | |
| 129 if (shm_zone->shm.exists) { | |
| 130 return NGX_ERROR; | |
| 131 } | |
| 132 | |
| 133 len = sizeof(" in upstream zone \"\"") + shm_zone->shm.name.len; | |
| 134 | |
| 135 shpool->log_ctx = ngx_slab_alloc(shpool, len); | |
| 136 if (shpool->log_ctx == NULL) { | |
| 137 return NGX_ERROR; | |
| 138 } | |
| 139 | |
| 140 ngx_sprintf(shpool->log_ctx, " in upstream zone \"%V\"%Z", | |
| 141 &shm_zone->shm.name); | |
| 142 | |
|
6123
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
143 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
144 /* copy peers to shared memory */ |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
145 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
146 umcf = shm_zone->data; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
147 uscfp = umcf->upstreams.elts; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
148 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
149 for (i = 0; i < umcf->upstreams.nelts; i++) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
150 uscf = uscfp[i]; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
151 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
152 if (uscf->shm_zone != shm_zone) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
153 continue; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
154 } |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
155 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
156 if (ngx_http_upstream_zone_copy_peers(shpool, uscf) != NGX_OK) { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
157 return NGX_ERROR; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
158 } |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
159 } |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
160 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
161 return NGX_OK; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
162 } |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
163 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
164 |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
165 static ngx_int_t |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
166 ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool, |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
167 ngx_http_upstream_srv_conf_t *uscf) |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
168 { |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
169 ngx_http_upstream_rr_peer_t *peer, **peerp; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
170 ngx_http_upstream_rr_peers_t *peers, *backup; |
|
caa103acf180
Upstream: allow multiple upstreams to use the same shared zone.
Ruslan Ermilov <ru@nginx.com>
parents:
6103
diff
changeset
|
171 |
| 6103 | 172 peers = ngx_slab_alloc(shpool, sizeof(ngx_http_upstream_rr_peers_t)); |
| 173 if (peers == NULL) { | |
| 174 return NGX_ERROR; | |
| 175 } | |
| 176 | |
| 177 ngx_memcpy(peers, uscf->peer.data, sizeof(ngx_http_upstream_rr_peers_t)); | |
| 178 | |
| 179 peers->shpool = shpool; | |
| 180 | |
| 181 for (peerp = &peers->peer; *peerp; peerp = &peer->next) { | |
| 182 /* pool is unlocked */ | |
| 183 peer = ngx_slab_calloc_locked(shpool, | |
| 184 sizeof(ngx_http_upstream_rr_peer_t)); | |
| 185 if (peer == NULL) { | |
| 186 return NGX_ERROR; | |
| 187 } | |
| 188 | |
| 189 ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t)); | |
| 190 | |
| 191 *peerp = peer; | |
| 192 } | |
| 193 | |
| 194 if (peers->next == NULL) { | |
| 195 goto done; | |
| 196 } | |
| 197 | |
| 198 backup = ngx_slab_alloc(shpool, sizeof(ngx_http_upstream_rr_peers_t)); | |
| 199 if (backup == NULL) { | |
| 200 return NGX_ERROR; | |
| 201 } | |
| 202 | |
| 203 ngx_memcpy(backup, peers->next, sizeof(ngx_http_upstream_rr_peers_t)); | |
| 204 | |
| 205 backup->shpool = shpool; | |
| 206 | |
| 207 for (peerp = &backup->peer; *peerp; peerp = &peer->next) { | |
| 208 /* pool is unlocked */ | |
| 209 peer = ngx_slab_calloc_locked(shpool, | |
| 210 sizeof(ngx_http_upstream_rr_peer_t)); | |
| 211 if (peer == NULL) { | |
| 212 return NGX_ERROR; | |
| 213 } | |
| 214 | |
| 215 ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t)); | |
| 216 | |
| 217 *peerp = peer; | |
| 218 } | |
| 219 | |
| 220 peers->next = backup; | |
| 221 | |
| 222 done: | |
| 223 | |
| 224 uscf->peer.data = peers; | |
| 225 | |
| 226 return NGX_OK; | |
| 227 } |