Mercurial > hg > nginx-quic
annotate src/http/ngx_http_upstream_round_robin.c @ 5923:2c10db908b8c
SPDY: push pending data while closing a stream as with keepalive.
This helps to avoid delays in sending the last chunk of data because
of bad interaction between Nagle's algorithm on nginx side and
delayed ACK on the client side.
Delays could also be caused by TCP_CORK/TCP_NOPUSH if SPDY was
working without SSL and sendfile() was used.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Fri, 21 Nov 2014 22:51:49 +0300 |
| parents | 575175ebf4b4 |
| children | 6ff0ebd6fbf4 |
| rev | line source |
|---|---|
| 884 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 884 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
|
5831
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
13 #define ngx_http_upstream_tries(p) ((p)->number \ |
|
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
14 + ((p)->next ? (p)->next->number : 0)) |
|
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
15 |
|
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
16 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
17 static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer( |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
18 ngx_http_upstream_rr_peer_data_t *rrp); |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
19 |
|
3964
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
20 #if (NGX_HTTP_SSL) |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
21 |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
22 static ngx_int_t ngx_http_upstream_empty_set_session(ngx_peer_connection_t *pc, |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
23 void *data); |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
24 static void ngx_http_upstream_empty_save_session(ngx_peer_connection_t *pc, |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
25 void *data); |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
26 |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
27 #endif |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
28 |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
29 |
| 884 | 30 ngx_int_t |
| 31 ngx_http_upstream_init_round_robin(ngx_conf_t *cf, | |
| 32 ngx_http_upstream_srv_conf_t *us) | |
| 33 { | |
| 34 ngx_url_t u; | |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
35 ngx_uint_t i, j, n, w; |
| 884 | 36 ngx_http_upstream_server_t *server; |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
37 ngx_http_upstream_rr_peer_t *peer; |
| 1378 | 38 ngx_http_upstream_rr_peers_t *peers, *backup; |
| 884 | 39 |
| 40 us->peer.init = ngx_http_upstream_init_round_robin_peer; | |
| 41 | |
| 42 if (us->servers) { | |
| 43 server = us->servers->elts; | |
| 44 | |
| 1378 | 45 n = 0; |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
46 w = 0; |
| 1378 | 47 |
| 884 | 48 for (i = 0; i < us->servers->nelts; i++) { |
| 1378 | 49 if (server[i].backup) { |
| 50 continue; | |
| 51 } | |
| 52 | |
| 884 | 53 n += server[i].naddrs; |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
54 w += server[i].naddrs * server[i].weight; |
| 884 | 55 } |
| 56 | |
|
4569
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
57 if (n == 0) { |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
58 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
59 "no servers in upstream \"%V\" in %s:%ui", |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
60 &us->host, us->file_name, us->line); |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
61 return NGX_ERROR; |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
62 } |
|
1db899642518
Upstream: reject upstreams without normal servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
63 |
| 884 | 64 peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peers_t) |
| 65 + sizeof(ngx_http_upstream_rr_peer_t) * (n - 1)); | |
| 66 if (peers == NULL) { | |
| 67 return NGX_ERROR; | |
| 68 } | |
| 69 | |
| 1378 | 70 peers->single = (n == 1); |
| 884 | 71 peers->number = n; |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
72 peers->weighted = (w != n); |
|
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
73 peers->total_weight = w; |
| 884 | 74 peers->name = &us->host; |
| 75 | |
| 76 n = 0; | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
77 peer = peers->peer; |
| 884 | 78 |
| 79 for (i = 0; i < us->servers->nelts; i++) { | |
|
5429
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
80 if (server[i].backup) { |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
81 continue; |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
82 } |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
83 |
| 884 | 84 for (j = 0; j < server[i].naddrs; j++) { |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
85 peer[n].sockaddr = server[i].addrs[j].sockaddr; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
86 peer[n].socklen = server[i].addrs[j].socklen; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
87 peer[n].name = server[i].addrs[j].name; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
88 peer[n].weight = server[i].weight; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
89 peer[n].effective_weight = server[i].weight; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
90 peer[n].current_weight = 0; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
91 peer[n].max_fails = server[i].max_fails; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
92 peer[n].fail_timeout = server[i].fail_timeout; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
93 peer[n].down = server[i].down; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
94 peer[n].server = server[i].name; |
| 884 | 95 n++; |
| 96 } | |
| 97 } | |
| 98 | |
| 99 us->peer.data = peers; | |
| 100 | |
| 1378 | 101 /* backup servers */ |
| 102 | |
| 103 n = 0; | |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
104 w = 0; |
| 1378 | 105 |
| 106 for (i = 0; i < us->servers->nelts; i++) { | |
| 107 if (!server[i].backup) { | |
| 108 continue; | |
| 109 } | |
| 110 | |
| 111 n += server[i].naddrs; | |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
112 w += server[i].naddrs * server[i].weight; |
| 1378 | 113 } |
| 114 | |
| 115 if (n == 0) { | |
| 116 return NGX_OK; | |
| 117 } | |
| 118 | |
| 119 backup = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peers_t) | |
| 120 + sizeof(ngx_http_upstream_rr_peer_t) * (n - 1)); | |
| 121 if (backup == NULL) { | |
| 122 return NGX_ERROR; | |
| 123 } | |
| 124 | |
| 125 peers->single = 0; | |
| 126 backup->single = 0; | |
| 127 backup->number = n; | |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
128 backup->weighted = (w != n); |
|
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
129 backup->total_weight = w; |
| 1378 | 130 backup->name = &us->host; |
| 131 | |
| 132 n = 0; | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
133 peer = backup->peer; |
| 1378 | 134 |
| 135 for (i = 0; i < us->servers->nelts; i++) { | |
|
5429
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
136 if (!server[i].backup) { |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
137 continue; |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
138 } |
|
e6a1623f87bc
Upstream: optimize loops in ngx_http_upstream_init_round_robin().
Xiaochen Wang <wangxiaochen0@gmail.com>
parents:
5220
diff
changeset
|
139 |
| 1378 | 140 for (j = 0; j < server[i].naddrs; j++) { |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
141 peer[n].sockaddr = server[i].addrs[j].sockaddr; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
142 peer[n].socklen = server[i].addrs[j].socklen; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
143 peer[n].name = server[i].addrs[j].name; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
144 peer[n].weight = server[i].weight; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
145 peer[n].effective_weight = server[i].weight; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
146 peer[n].current_weight = 0; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
147 peer[n].max_fails = server[i].max_fails; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
148 peer[n].fail_timeout = server[i].fail_timeout; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
149 peer[n].down = server[i].down; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
150 peer[n].server = server[i].name; |
| 1378 | 151 n++; |
| 152 } | |
| 153 } | |
| 154 | |
| 155 peers->next = backup; | |
| 156 | |
| 884 | 157 return NGX_OK; |
| 158 } | |
| 159 | |
| 160 | |
| 161 /* an upstream implicitly defined by proxy_pass, etc. */ | |
| 162 | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4991
diff
changeset
|
163 if (us->port == 0) { |
| 906 | 164 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
| 165 "no port in upstream \"%V\" in %s:%ui", | |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1465
diff
changeset
|
166 &us->host, us->file_name, us->line); |
| 906 | 167 return NGX_ERROR; |
| 168 } | |
| 169 | |
| 884 | 170 ngx_memzero(&u, sizeof(ngx_url_t)); |
| 171 | |
| 172 u.host = us->host; | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4991
diff
changeset
|
173 u.port = us->port; |
| 884 | 174 |
|
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1556
diff
changeset
|
175 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { |
| 884 | 176 if (u.err) { |
| 177 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
|
896
f247db60fc85
fix fastcgi and memcached upstreams
Igor Sysoev <igor@sysoev.ru>
parents:
884
diff
changeset
|
178 "%s in upstream \"%V\" in %s:%ui", |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1465
diff
changeset
|
179 u.err, &us->host, us->file_name, us->line); |
| 884 | 180 } |
| 181 | |
| 182 return NGX_ERROR; | |
| 183 } | |
| 184 | |
| 185 n = u.naddrs; | |
| 186 | |
| 187 peers = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_rr_peers_t) | |
| 188 + sizeof(ngx_http_upstream_rr_peer_t) * (n - 1)); | |
| 189 if (peers == NULL) { | |
| 190 return NGX_ERROR; | |
| 191 } | |
| 192 | |
| 1378 | 193 peers->single = (n == 1); |
| 884 | 194 peers->number = n; |
|
4655
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
195 peers->weighted = 0; |
|
382c523d253a
Upstream: weights support in ip_hash balancer.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4622
diff
changeset
|
196 peers->total_weight = n; |
| 884 | 197 peers->name = &us->host; |
| 198 | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
199 peer = peers->peer; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
200 |
| 884 | 201 for (i = 0; i < u.naddrs; i++) { |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
202 peer[i].sockaddr = u.addrs[i].sockaddr; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
203 peer[i].socklen = u.addrs[i].socklen; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
204 peer[i].name = u.addrs[i].name; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
205 peer[i].weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
206 peer[i].effective_weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
207 peer[i].current_weight = 0; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
208 peer[i].max_fails = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
209 peer[i].fail_timeout = 10; |
| 884 | 210 } |
| 211 | |
| 212 us->peer.data = peers; | |
| 213 | |
| 1378 | 214 /* implicitly defined upstream has no backup servers */ |
| 215 | |
| 884 | 216 return NGX_OK; |
| 217 } | |
| 218 | |
| 219 | |
| 220 ngx_int_t | |
| 221 ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r, | |
| 222 ngx_http_upstream_srv_conf_t *us) | |
| 223 { | |
| 224 ngx_uint_t n; | |
| 225 ngx_http_upstream_rr_peer_data_t *rrp; | |
| 226 | |
| 227 rrp = r->upstream->peer.data; | |
| 228 | |
| 229 if (rrp == NULL) { | |
| 230 rrp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_rr_peer_data_t)); | |
| 231 if (rrp == NULL) { | |
| 232 return NGX_ERROR; | |
| 233 } | |
| 234 | |
| 235 r->upstream->peer.data = rrp; | |
| 236 } | |
| 237 | |
| 238 rrp->peers = us->peer.data; | |
| 239 rrp->current = 0; | |
| 240 | |
|
4011
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
241 n = rrp->peers->number; |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
242 |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
243 if (rrp->peers->next && rrp->peers->next->number > n) { |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
244 n = rrp->peers->next->number; |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
245 } |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
246 |
|
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
247 if (n <= 8 * sizeof(uintptr_t)) { |
| 884 | 248 rrp->tried = &rrp->data; |
| 249 rrp->data = 0; | |
| 250 | |
| 251 } else { | |
|
4011
9d4cbb09ae8b
Upstream: properly allocate memory for tried flags.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4010
diff
changeset
|
252 n = (n + (8 * sizeof(uintptr_t) - 1)) / (8 * sizeof(uintptr_t)); |
| 884 | 253 |
| 254 rrp->tried = ngx_pcalloc(r->pool, n * sizeof(uintptr_t)); | |
| 255 if (rrp->tried == NULL) { | |
| 256 return NGX_ERROR; | |
| 257 } | |
| 258 } | |
| 259 | |
| 260 r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer; | |
| 261 r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer; | |
|
5831
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
262 r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers); |
| 884 | 263 #if (NGX_HTTP_SSL) |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
264 r->upstream->peer.set_session = |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
265 ngx_http_upstream_set_round_robin_peer_session; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
266 r->upstream->peer.save_session = |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
267 ngx_http_upstream_save_round_robin_peer_session; |
| 884 | 268 #endif |
| 269 | |
| 270 return NGX_OK; | |
| 271 } | |
| 272 | |
| 273 | |
| 274 ngx_int_t | |
| 1658 | 275 ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, |
| 276 ngx_http_upstream_resolved_t *ur) | |
| 277 { | |
| 278 u_char *p; | |
| 279 size_t len; | |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
280 socklen_t socklen; |
| 1658 | 281 ngx_uint_t i, n; |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
282 struct sockaddr *sockaddr; |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
283 ngx_http_upstream_rr_peer_t *peer; |
| 1658 | 284 ngx_http_upstream_rr_peers_t *peers; |
| 285 ngx_http_upstream_rr_peer_data_t *rrp; | |
| 286 | |
| 287 rrp = r->upstream->peer.data; | |
| 288 | |
| 289 if (rrp == NULL) { | |
| 290 rrp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_rr_peer_data_t)); | |
| 291 if (rrp == NULL) { | |
| 292 return NGX_ERROR; | |
| 293 } | |
| 294 | |
| 295 r->upstream->peer.data = rrp; | |
| 296 } | |
| 297 | |
| 298 peers = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_rr_peers_t) | |
| 299 + sizeof(ngx_http_upstream_rr_peer_t) * (ur->naddrs - 1)); | |
| 300 if (peers == NULL) { | |
| 301 return NGX_ERROR; | |
| 302 } | |
| 303 | |
| 304 peers->single = (ur->naddrs == 1); | |
| 305 peers->number = ur->naddrs; | |
| 306 peers->name = &ur->host; | |
| 307 | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
308 peer = peers->peer; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
309 |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
310 if (ur->sockaddr) { |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
311 peer[0].sockaddr = ur->sockaddr; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
312 peer[0].socklen = ur->socklen; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
313 peer[0].name = ur->host; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
314 peer[0].weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
315 peer[0].effective_weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
316 peer[0].current_weight = 0; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
317 peer[0].max_fails = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
318 peer[0].fail_timeout = 10; |
| 1658 | 319 |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
320 } else { |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
321 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
322 for (i = 0; i < ur->naddrs; i++) { |
| 1658 | 323 |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
324 socklen = ur->addrs[i].socklen; |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
325 |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
326 sockaddr = ngx_palloc(r->pool, socklen); |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
327 if (sockaddr == NULL) { |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
328 return NGX_ERROR; |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
329 } |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
330 |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
331 ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen); |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
332 |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
333 switch (sockaddr->sa_family) { |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
334 #if (NGX_HAVE_INET6) |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
335 case AF_INET6: |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
336 ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port); |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
337 break; |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
338 #endif |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
339 default: /* AF_INET */ |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
340 ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port); |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
341 } |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
342 |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
343 p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN); |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
344 if (p == NULL) { |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
345 return NGX_ERROR; |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
346 } |
| 1658 | 347 |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5454
diff
changeset
|
348 len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1); |
| 1658 | 349 |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
350 peer[i].sockaddr = sockaddr; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
351 peer[i].socklen = socklen; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
352 peer[i].name.len = len; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
353 peer[i].name.data = p; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
354 peer[i].weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
355 peer[i].effective_weight = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
356 peer[i].current_weight = 0; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
357 peer[i].max_fails = 1; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
358 peer[i].fail_timeout = 10; |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2204
diff
changeset
|
359 } |
| 1658 | 360 } |
| 361 | |
| 362 rrp->peers = peers; | |
| 363 rrp->current = 0; | |
| 364 | |
| 365 if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { | |
| 366 rrp->tried = &rrp->data; | |
| 367 rrp->data = 0; | |
| 368 | |
| 369 } else { | |
| 370 n = (rrp->peers->number + (8 * sizeof(uintptr_t) - 1)) | |
| 371 / (8 * sizeof(uintptr_t)); | |
| 372 | |
| 373 rrp->tried = ngx_pcalloc(r->pool, n * sizeof(uintptr_t)); | |
| 374 if (rrp->tried == NULL) { | |
| 375 return NGX_ERROR; | |
| 376 } | |
| 377 } | |
| 378 | |
| 379 r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer; | |
| 380 r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer; | |
|
5831
575175ebf4b4
Upstream: included backup peers into peer.tries.
Roman Arutyunyan <arut@nginx.com>
parents:
5756
diff
changeset
|
381 r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers); |
| 1658 | 382 #if (NGX_HTTP_SSL) |
|
3964
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
383 r->upstream->peer.set_session = ngx_http_upstream_empty_set_session; |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
384 r->upstream->peer.save_session = ngx_http_upstream_empty_save_session; |
| 1658 | 385 #endif |
| 386 | |
| 387 return NGX_OK; | |
| 388 } | |
| 389 | |
| 390 | |
| 391 ngx_int_t | |
| 884 | 392 ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) |
| 393 { | |
| 394 ngx_http_upstream_rr_peer_data_t *rrp = data; | |
| 395 | |
| 1378 | 396 ngx_int_t rc; |
| 397 ngx_uint_t i, n; | |
| 398 ngx_http_upstream_rr_peer_t *peer; | |
| 399 ngx_http_upstream_rr_peers_t *peers; | |
| 884 | 400 |
| 401 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
| 402 "get rr peer, try: %ui", pc->tries); | |
| 403 | |
| 404 pc->cached = 0; | |
| 405 pc->connection = NULL; | |
| 406 | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
407 peers = rrp->peers; |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
408 |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
409 /* ngx_lock_mutex(peers->mutex); */ |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
410 |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
411 if (peers->single) { |
|
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
412 peer = &peers->peer[0]; |
| 884 | 413 |
|
4914
dcb853acae97
Upstream: honor the "down" flag for a single server.
Ruslan Ermilov <ru@nginx.com>
parents:
4655
diff
changeset
|
414 if (peer->down) { |
|
dcb853acae97
Upstream: honor the "down" flag for a single server.
Ruslan Ermilov <ru@nginx.com>
parents:
4655
diff
changeset
|
415 goto failed; |
|
dcb853acae97
Upstream: honor the "down" flag for a single server.
Ruslan Ermilov <ru@nginx.com>
parents:
4655
diff
changeset
|
416 } |
|
dcb853acae97
Upstream: honor the "down" flag for a single server.
Ruslan Ermilov <ru@nginx.com>
parents:
4655
diff
changeset
|
417 |
| 884 | 418 } else { |
| 419 | |
| 420 /* there are several peers */ | |
| 421 | |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
422 peer = ngx_http_upstream_get_peer(rrp); |
| 884 | 423 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
424 if (peer == NULL) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
425 goto failed; |
| 884 | 426 } |
| 427 | |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
428 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
429 "get rr peer, current: %ui %i", |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
430 rrp->current, peer->current_weight); |
| 884 | 431 } |
| 432 | |
| 433 pc->sockaddr = peer->sockaddr; | |
| 434 pc->socklen = peer->socklen; | |
| 435 pc->name = &peer->name; | |
| 436 | |
|
5720
ab540dd44528
Upstream: simplified some code that accesses peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
437 /* ngx_unlock_mutex(peers->mutex); */ |
| 884 | 438 |
| 439 return NGX_OK; | |
| 440 | |
| 441 failed: | |
| 442 | |
| 1378 | 443 if (peers->next) { |
| 444 | |
| 445 /* ngx_unlock_mutex(peers->mutex); */ | |
| 446 | |
| 447 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0, "backup servers"); | |
| 448 | |
| 449 rrp->peers = peers->next; | |
| 450 | |
|
4991
a384c60d55f3
Upstream: fixed state resetting when switching to backup servers.
Valentin Bartenev <vbart@nginx.com>
parents:
4914
diff
changeset
|
451 n = (rrp->peers->number + (8 * sizeof(uintptr_t) - 1)) |
|
a384c60d55f3
Upstream: fixed state resetting when switching to backup servers.
Valentin Bartenev <vbart@nginx.com>
parents:
4914
diff
changeset
|
452 / (8 * sizeof(uintptr_t)); |
|
a384c60d55f3
Upstream: fixed state resetting when switching to backup servers.
Valentin Bartenev <vbart@nginx.com>
parents:
4914
diff
changeset
|
453 |
| 1389 | 454 for (i = 0; i < n; i++) { |
| 1378 | 455 rrp->tried[i] = 0; |
| 456 } | |
| 457 | |
| 458 rc = ngx_http_upstream_get_round_robin_peer(pc, rrp); | |
| 459 | |
| 460 if (rc != NGX_BUSY) { | |
| 461 return rc; | |
| 462 } | |
| 463 | |
| 464 /* ngx_lock_mutex(peers->mutex); */ | |
| 465 } | |
| 466 | |
| 884 | 467 /* all peers failed, mark them as live for quick recovery */ |
| 468 | |
| 1378 | 469 for (i = 0; i < peers->number; i++) { |
| 470 peers->peer[i].fails = 0; | |
| 884 | 471 } |
| 472 | |
| 1378 | 473 /* ngx_unlock_mutex(peers->mutex); */ |
| 884 | 474 |
| 1378 | 475 pc->name = peers->name; |
| 884 | 476 |
| 477 return NGX_BUSY; | |
| 478 } | |
| 479 | |
| 480 | |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
481 static ngx_http_upstream_rr_peer_t * |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
482 ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp) |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
483 { |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
484 time_t now; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
485 uintptr_t m; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
486 ngx_int_t total; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
487 ngx_uint_t i, n; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
488 ngx_http_upstream_rr_peer_t *peer, *best; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
489 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
490 now = ngx_time(); |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
491 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
492 best = NULL; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
493 total = 0; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
494 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
495 for (i = 0; i < rrp->peers->number; i++) { |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
496 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
497 n = i / (8 * sizeof(uintptr_t)); |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
498 m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t)); |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
499 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
500 if (rrp->tried[n] & m) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
501 continue; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
502 } |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
503 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
504 peer = &rrp->peers->peer[i]; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
505 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
506 if (peer->down) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
507 continue; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
508 } |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
509 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
510 if (peer->max_fails |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
511 && peer->fails >= peer->max_fails |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
512 && now - peer->checked <= peer->fail_timeout) |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
513 { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
514 continue; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
515 } |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
516 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
517 peer->current_weight += peer->effective_weight; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
518 total += peer->effective_weight; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
519 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
520 if (peer->effective_weight < peer->weight) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
521 peer->effective_weight++; |
|
4010
74a93d3fdd85
Fixing cpu hog with all upstream servers marked "down".
Maxim Dounin <mdounin@mdounin.ru>
parents:
3964
diff
changeset
|
522 } |
|
74a93d3fdd85
Fixing cpu hog with all upstream servers marked "down".
Maxim Dounin <mdounin@mdounin.ru>
parents:
3964
diff
changeset
|
523 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
524 if (best == NULL || peer->current_weight > best->current_weight) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
525 best = peer; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
526 } |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
527 } |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
528 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
529 if (best == NULL) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
530 return NULL; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
531 } |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
532 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
533 i = best - &rrp->peers->peer[0]; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
534 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
535 rrp->current = i; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
536 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
537 n = i / (8 * sizeof(uintptr_t)); |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
538 m = (uintptr_t) 1 << i % (8 * sizeof(uintptr_t)); |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
539 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
540 rrp->tried[n] |= m; |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
541 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
542 best->current_weight -= total; |
|
5220
1d68b502088c
Upstream: fixed fail_timeout and max_fails > 1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5136
diff
changeset
|
543 |
|
1d68b502088c
Upstream: fixed fail_timeout and max_fails > 1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5136
diff
changeset
|
544 if (now - best->checked > best->fail_timeout) { |
|
1d68b502088c
Upstream: fixed fail_timeout and max_fails > 1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5136
diff
changeset
|
545 best->checked = now; |
|
1d68b502088c
Upstream: fixed fail_timeout and max_fails > 1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5136
diff
changeset
|
546 } |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
547 |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
548 return best; |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
549 } |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
550 |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
551 |
| 884 | 552 void |
| 553 ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data, | |
| 554 ngx_uint_t state) | |
| 555 { | |
| 556 ngx_http_upstream_rr_peer_data_t *rrp = data; | |
| 557 | |
| 558 time_t now; | |
| 559 ngx_http_upstream_rr_peer_t *peer; | |
| 560 | |
| 561 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
| 562 "free rr peer %ui %ui", pc->tries, state); | |
| 563 | |
| 564 /* TODO: NGX_PEER_KEEPALIVE */ | |
| 565 | |
| 1378 | 566 if (rrp->peers->single) { |
| 884 | 567 pc->tries = 0; |
| 568 return; | |
| 569 } | |
| 570 | |
|
4207
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
571 peer = &rrp->peers->peer[rrp->current]; |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
572 |
| 884 | 573 if (state & NGX_PEER_FAILED) { |
| 574 now = ngx_time(); | |
| 575 | |
| 576 /* ngx_lock_mutex(rrp->peers->mutex); */ | |
| 577 | |
| 578 peer->fails++; | |
| 579 peer->accessed = now; | |
|
4207
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
580 peer->checked = now; |
| 884 | 581 |
|
2204
70a2bcc7e307
fix divide by zero if max_fails=0
Igor Sysoev <igor@sysoev.ru>
parents:
2197
diff
changeset
|
582 if (peer->max_fails) { |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
583 peer->effective_weight -= peer->weight / peer->max_fails; |
|
2204
70a2bcc7e307
fix divide by zero if max_fails=0
Igor Sysoev <igor@sysoev.ru>
parents:
2197
diff
changeset
|
584 } |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
585 |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
586 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
|
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
587 "free rr peer failed: %ui %i", |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
588 rrp->current, peer->effective_weight); |
|
1344
8f5b5641966c
fair upstream weight balancer
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
589 |
|
4621
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
590 if (peer->effective_weight < 0) { |
|
c90801720a0c
Upstream: smooth weighted round-robin balancing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4569
diff
changeset
|
591 peer->effective_weight = 0; |
| 884 | 592 } |
| 593 | |
| 594 /* ngx_unlock_mutex(rrp->peers->mutex); */ | |
|
4207
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
595 |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
596 } else { |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
597 |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
598 /* mark peer live if check passed */ |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
599 |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
600 if (peer->accessed < peer->checked) { |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
601 peer->fails = 0; |
|
4fc91bae6f83
Better recheck of dead upstream servers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4011
diff
changeset
|
602 } |
| 884 | 603 } |
| 604 | |
| 605 if (pc->tries) { | |
| 606 pc->tries--; | |
| 607 } | |
| 608 | |
| 609 /* ngx_unlock_mutex(rrp->peers->mutex); */ | |
| 610 } | |
| 611 | |
| 612 | |
| 613 #if (NGX_HTTP_SSL) | |
| 614 | |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
615 ngx_int_t |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
616 ngx_http_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc, |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
617 void *data) |
| 884 | 618 { |
| 619 ngx_http_upstream_rr_peer_data_t *rrp = data; | |
| 620 | |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
621 ngx_int_t rc; |
| 884 | 622 ngx_ssl_session_t *ssl_session; |
| 623 ngx_http_upstream_rr_peer_t *peer; | |
| 624 | |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
625 peer = &rrp->peers->peer[rrp->current]; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
626 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
627 /* TODO: threads only mutex */ |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
628 /* ngx_lock_mutex(rrp->peers->mutex); */ |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
629 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
630 ssl_session = peer->ssl_session; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
631 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
632 rc = ngx_ssl_set_session(pc->connection, ssl_session); |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
633 |
|
5756
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
634 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
|
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
635 "set session: %p", ssl_session); |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
636 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
637 /* ngx_unlock_mutex(rrp->peers->mutex); */ |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
638 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
639 return rc; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
640 } |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
641 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
642 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
643 void |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
644 ngx_http_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc, |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
645 void *data) |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
646 { |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
647 ngx_http_upstream_rr_peer_data_t *rrp = data; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
648 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
649 ngx_ssl_session_t *old_ssl_session, *ssl_session; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
650 ngx_http_upstream_rr_peer_t *peer; |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
651 |
| 884 | 652 ssl_session = ngx_ssl_get_session(pc->connection); |
| 653 | |
| 654 if (ssl_session == NULL) { | |
| 655 return; | |
| 656 } | |
| 657 | |
|
5756
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
658 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
|
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
659 "save session: %p", ssl_session); |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
660 |
| 884 | 661 peer = &rrp->peers->peer[rrp->current]; |
| 662 | |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
663 /* TODO: threads only mutex */ |
| 884 | 664 /* ngx_lock_mutex(rrp->peers->mutex); */ |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
665 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
666 old_ssl_session = peer->ssl_session; |
| 884 | 667 peer->ssl_session = ssl_session; |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
668 |
| 884 | 669 /* ngx_unlock_mutex(rrp->peers->mutex); */ |
| 670 | |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
671 if (old_ssl_session) { |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
672 |
|
5756
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
673 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
|
5b7276408565
SSL: stop accessing SSL_SESSION's fields directly.
Piotr Sikora <piotr@cloudflare.com>
parents:
5720
diff
changeset
|
674 "old session: %p", old_ssl_session); |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
675 |
| 884 | 676 /* TODO: may block */ |
|
1284
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
677 |
|
be2b895d31e0
fix segfault when session was freed twice
Igor Sysoev <igor@sysoev.ru>
parents:
1206
diff
changeset
|
678 ngx_ssl_free_session(old_ssl_session); |
| 884 | 679 } |
| 680 } | |
| 681 | |
|
3964
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
682 |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
683 static ngx_int_t |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
684 ngx_http_upstream_empty_set_session(ngx_peer_connection_t *pc, void *data) |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
685 { |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
686 return NGX_OK; |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
687 } |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
688 |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
689 |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
690 static void |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
691 ngx_http_upstream_empty_save_session(ngx_peer_connection_t *pc, void *data) |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
692 { |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
693 return; |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
694 } |
|
ff127ba3b091
do not try to reuse and save a SSL session for a peer created on the fly
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
695 |
| 884 | 696 #endif |