RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-01 02:52:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: remove unused legacy code in mworker_cleanlisteners

Browse Source 
This cleanup is a follow up of "CLEANUP: peers: unused code path in
process_peer_sync"

There are some remnants of 1.6 peers specific code in mworker_cleanlisteners()
that was introduced with this patch serie:
f83d3fe00a MEDIUM: init: stop any peers section not bound to the correct process
47c8c029db MEDIUM: init: completely deallocate unused peers

Back then, nbthread did not exist, nbproc was used instead.
Updating some comments to make them more relevant to current haproxy design.
(multithreaded single process)

Moreover, in 47c8c029db, task_free() was performed on peers_fe->task.
But by looking at the code, from 1.6 til now, peers_fe->task
is never used for peers proxies, it is only used for main proxies (referenced
in proxies_list).
Removing this extra task cleanup because it is misleading.
This commit is contained in:
Aurelien DARRAGON 2022-11-23 19:56:35 +01:00 committed by William Lallemand
parent b118f2f407
commit 1412d31a6d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mworker.c
View File

@ -460,7 +460,7 @@ void mworker_cleanlisteners()
struct proxy *curproxy;
struct peers *curpeers;
/* we might have to unbind some peers sections from some processes */
/* peers proxies cleanup */
for (curpeers = cfg_peers; curpeers; curpeers = curpeers->next) {
if (!curpeers->peers_fe)
continue;
@ -472,11 +472,10 @@ void mworker_cleanlisteners()
if (curpeers->sync_task)
task_destroy(curpeers->sync_task);
curpeers->sync_task = NULL;
task_destroy(curpeers->peers_fe->task);
curpeers->peers_fe->task = NULL;
curpeers->peers_fe = NULL;
}
/* main proxies cleanup */
for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {
int listen_in_master = 0;