1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: proxy: collect per-capability stat in proxy_cond_disable()

Browse Source 
proxy_cond_disable() collects and prints cumulated connections for be and
fe proxies no matter their type. With shared stats it may cause issues
because depending on the proxy capabilities only fe or be counters may
be allocated.

In this patch we add some checks to ensure we only try to read from
valid memory locations, else we rely on default values (0).
This commit is contained in:
Aurelien DARRAGON 2025-05-12 17:12:49 +02:00
parent c7c017ec3c
commit 6ccf770fe2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/proxy.c
View File

@ -2058,6 +2058,9 @@ void proxy_cond_resume(struct proxy *p)
*/
void proxy_cond_disable(struct proxy *p)
{
long long cum_conn = 0;
long long cum_sess = 0;
if (p->flags & (PR_FL_DISABLED|PR_FL_STOPPED))
return;
@ -2072,13 +2075,18 @@ void proxy_cond_disable(struct proxy *p)
* peers, etc) we must not report them at all as they're not really on
* the data plane but on the control plane.
*/
if (p->cap & PR_CAP_FE)
cum_conn = p->fe_counters.cum_conn;
if (p->cap & PR_CAP_BE)
cum_sess = p->be_counters.cum_sess;
if ((p->mode == PR_MODE_TCP || p->mode == PR_MODE_HTTP || p->mode == PR_MODE_SYSLOG || p->mode == PR_MODE_SPOP) && !(p->cap & PR_CAP_INT))
ha_warning("Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n",
p->id, p->fe_counters.cum_conn, p->be_counters.cum_sess);
p->id, cum_conn, cum_sess);
if ((p->mode == PR_MODE_TCP || p->mode == PR_MODE_HTTP || p->mode == PR_MODE_SPOP) && !(p->cap & PR_CAP_INT))
send_log(p, LOG_WARNING, "Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n",
p->id, p->fe_counters.cum_conn, p->be_counters.cum_sess);
p->id, cum_conn, cum_sess);
if (p->table && p->table->size && p->table->sync_task)
task_wakeup(p->table->sync_task, TASK_WOKEN_MSG);