mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: stats: do not report "100%" in the thottle column when server is draining

Browse Source 
A condition was missing and we used to have "throttle 100%" even when
the server was draining connections, which is misleading but harmless.
This commit is contained in:
Willy Tarreau 2014-05-14 00:09:59 +02:00
parent 87eb1d6994
commit e21f84903e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dumpstats.c
View File

@ -2987,7 +2987,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
chunk_appendf(&trash, "<td colspan=3></td>"); chunk_appendf(&trash, "<td colspan=3></td>");
/* throttle */ /* throttle */
if (sv->state & SRV_WARMINGUP) if ((sv->state & SRV_WARMINGUP) && !server_is_draining(sv))
chunk_appendf(&trash, "<td class=ac>%d %%</td></tr>\n", server_throttle_rate(sv)); chunk_appendf(&trash, "<td class=ac>%d %%</td></tr>\n", server_throttle_rate(sv));
else else
chunk_appendf(&trash, "<td class=ac>-</td></tr>\n"); chunk_appendf(&trash, "<td class=ac>-</td></tr>\n");
@ -3065,7 +3065,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
relative_pid, px->uuid, sv->puid); relative_pid, px->uuid, sv->puid);
/* throttle */ /* throttle */
if (sv->state & SRV_WARMINGUP) if ((sv->state & SRV_WARMINGUP) && !server_is_draining(sv))
chunk_appendf(&trash, "%d", server_throttle_rate(sv)); chunk_appendf(&trash, "%d", server_throttle_rate(sv));
/* sessions: lbtot */ /* sessions: lbtot */