mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2026-03-14 03:22:06 +01:00
5000f0b2ef
Servers iteration via promex is now resilient to server runtime deletion thanks to the watcher mechanism. However, the watcher was not correctly initialized which could cause duplicate metrics reporting. This issue happens when promex dump yielded when manipulating the last server of a proxy. If this server is removed in parallel, <sv> pointer will be set to NULL when promex resumes. Instead of switching to another proxy, the code would reuse the same one and iterate again on the same server list. To fix this issue, <sv> pointer must not be reinitialized just after a resumption point. Instead, this is now performed before promex_dump_srv_metrics(), or just after switching to another proxy instance. Thus, on resumption, if promex_dump_srv_metrics() is started with <sv> as NULL, it means that the server was deleted and the end of the current proxy list is reached, hence iteration is restarted on the next proxy instance. Note that ctx.p[1] does not need to be manually updated at the end of promex_dump_srv_metrics() as srv_watch already does that. This patch must be backported up to 3.0.