mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: stats: Differentiate between DRAIN and DRAIN (agent)

Browse Source 
Differentiate between DRAIN and DRAIN (agent) when reporting stats.
This is consistent with the distinction made between DOWN and DOWN (agent).

Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Simon Horman 2015-04-23 14:51:29 +09:00 committed by Willy Tarreau
parent 4463d19d48
commit b167b6bff9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dumpstats.c
View File

@ -2929,6 +2929,7 @@ enum srv_stats_state {
SRV_STATS_STATE_NOLB, SRV_STATS_STATE_NOLB,
SRV_STATS_STATE_DRAIN_GOING_DOWN, SRV_STATS_STATE_DRAIN_GOING_DOWN,
SRV_STATS_STATE_DRAIN, SRV_STATS_STATE_DRAIN,
SRV_STATS_STATE_DRAIN_AGENT,
SRV_STATS_STATE_NO_CHECK, SRV_STATS_STATE_NO_CHECK,
SRV_STATS_STATE_COUNT, /* Must be last */ SRV_STATS_STATE_COUNT, /* Must be last */
@ -2989,6 +2990,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
[SRV_STATS_STATE_NOLB] = "NOLB", [SRV_STATS_STATE_NOLB] = "NOLB",
[SRV_STATS_STATE_DRAIN_GOING_DOWN] = "DRAIN %d/%d &darr;", [SRV_STATS_STATE_DRAIN_GOING_DOWN] = "DRAIN %d/%d &darr;",
[SRV_STATS_STATE_DRAIN] = "DRAIN", [SRV_STATS_STATE_DRAIN] = "DRAIN",
[SRV_STATS_STATE_DRAIN_AGENT] = "DRAIN (agent)",
[SRV_STATS_STATE_NO_CHECK] = "<i>no check</i>", [SRV_STATS_STATE_NO_CHECK] = "<i>no check</i>",
}; };
@ -3243,6 +3245,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
[SRV_STATS_STATE_NOLB] = "NOLB,", [SRV_STATS_STATE_NOLB] = "NOLB,",
[SRV_STATS_STATE_DRAIN_GOING_DOWN] = "DRAIN %d/%d,", [SRV_STATS_STATE_DRAIN_GOING_DOWN] = "DRAIN %d/%d,",
[SRV_STATS_STATE_DRAIN] = "DRAIN,", [SRV_STATS_STATE_DRAIN] = "DRAIN,",
[SRV_STATS_STATE_DRAIN_AGENT] = "DRAIN (agent)",
[SRV_STATS_STATE_NO_CHECK] = "no check," [SRV_STATS_STATE_NO_CHECK] = "no check,"
}; };
@ -3910,7 +3913,9 @@ static int stats_dump_proxy_to_buffer(struct stream_interface *si, struct proxy
sv_colour = SRV_STATS_COLOUR_DRAINING; sv_colour = SRV_STATS_COLOUR_DRAINING;
if (sv->admin & SRV_ADMF_DRAIN) { if (sv->admin & SRV_ADMF_DRAIN) {
if (sv_state == SRV_STATS_STATE_UP_GOING_DOWN) if (svs->agent.state & CHK_ST_ENABLED)
sv_state = SRV_STATS_STATE_DRAIN_AGENT;
else if (sv_state == SRV_STATS_STATE_UP_GOING_DOWN)
sv_state = SRV_STATS_STATE_DRAIN_GOING_DOWN; sv_state = SRV_STATS_STATE_DRAIN_GOING_DOWN;
else else
sv_state = SRV_STATS_STATE_DRAIN; sv_state = SRV_STATS_STATE_DRAIN;