mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 17:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upstream: removed sorting of upstream servers.

Browse Source 
Sorting of upstream servers by their weights is not required by
current balancing algorithms.

This will likely change mapping to backends served by ip_hash
weighted upstreams.
This commit is contained in:
Ruslan Ermilov 2013-03-25 13:41:30 +00:00
parent 4f2d6513dc
commit 4d9fdd86f7
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/http/ngx_http_upstream_round_robin.c
View File

@ -10,8 +10,6 @@
#include <ngx_http.h> #include <ngx_http.h>
static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
const void *two);
static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer( static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer(
ngx_http_upstream_rr_peer_data_t *rrp); ngx_http_upstream_rr_peer_data_t *rrp);
@ -93,10 +91,6 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
us->peer.data = peers; us->peer.data = peers;
ngx_sort(&peers->peer[0], (size_t) n,
sizeof(ngx_http_upstream_rr_peer_t),
ngx_http_upstream_cmp_servers);
/* backup servers */ /* backup servers */
n = 0; n = 0;
@ -151,10 +145,6 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
peers->next = backup; peers->next = backup;
ngx_sort(&backup->peer[0], (size_t) n,
sizeof(ngx_http_upstream_rr_peer_t),
ngx_http_upstream_cmp_servers);
return NGX_OK; return NGX_OK;
} }
@ -216,18 +206,6 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
} }
static ngx_int_t
ngx_http_upstream_cmp_servers(const void *one, const void *two)
{
ngx_http_upstream_rr_peer_t *first, *second;
first = (ngx_http_upstream_rr_peer_t *) one;
second = (ngx_http_upstream_rr_peer_t *) two;
return (first->weight < second->weight);
}
ngx_int_t ngx_int_t
ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r, ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
ngx_http_upstream_srv_conf_t *us) ngx_http_upstream_srv_conf_t *us)