mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-20 20:51:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: remove redundant lock in least_conn.

Browse Source 
The recursive call to `ngx_*_upstream_get_least_conn_peer` already sets
the peer name on NGX_BUSY, so we can return immediately instead of
locking the list of peers again.
This commit is contained in:
Aleksei Bavshin 2024-12-06 21:39:17 -08:00
parent e28ef42b97
commit 6199d8bfbf
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/modules/ngx_http_upstream_least_conn_module.c
View File

@ -103,7 +103,7 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
time_t now; time_t now;
uintptr_t m; uintptr_t m;
ngx_int_t rc, total; ngx_int_t total;
ngx_uint_t i, n, p, many; ngx_uint_t i, n, p, many;
ngx_http_upstream_rr_peer_t *peer, *best; ngx_http_upstream_rr_peer_t *peer, *best;
ngx_http_upstream_rr_peers_t *peers; ngx_http_upstream_rr_peers_t *peers;
@ -278,13 +278,7 @@ failed:
ngx_http_upstream_rr_peers_unlock(peers); ngx_http_upstream_rr_peers_unlock(peers);
rc = ngx_http_upstream_get_least_conn_peer(pc, rrp); return ngx_http_upstream_get_least_conn_peer(pc, rrp);
if (rc != NGX_BUSY) {
return rc;
}
ngx_http_upstream_rr_peers_wlock(peers);
} }
#if (NGX_HTTP_UPSTREAM_ZONE) #if (NGX_HTTP_UPSTREAM_ZONE)

10
src/stream/ngx_stream_upstream_least_conn_module.c
View File

@ -100,7 +100,7 @@ ngx_stream_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
time_t now; time_t now;
uintptr_t m; uintptr_t m;
ngx_int_t rc, total; ngx_int_t total;
ngx_uint_t i, n, p, many; ngx_uint_t i, n, p, many;
ngx_stream_upstream_rr_peer_t *peer, *best; ngx_stream_upstream_rr_peer_t *peer, *best;
ngx_stream_upstream_rr_peers_t *peers; ngx_stream_upstream_rr_peers_t *peers;
@ -274,13 +274,7 @@ failed:
ngx_stream_upstream_rr_peers_unlock(peers); ngx_stream_upstream_rr_peers_unlock(peers);
rc = ngx_stream_upstream_get_least_conn_peer(pc, rrp); return ngx_stream_upstream_get_least_conn_peer(pc, rrp);
if (rc != NGX_BUSY) {
return rc;
}
ngx_stream_upstream_rr_peers_wlock(peers);
} }
#if (NGX_STREAM_UPSTREAM_ZONE) #if (NGX_STREAM_UPSTREAM_ZONE)