RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-05 10:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: stats: report a server's own state instead of the tracked one's

Browse Source 
Now that servers have their own states, let's report this one instead of
following the tracked server chain and reporting the tracked server's.
However the tracked server is still used to report x/y when a server is
going up or down. When the agent reports a down state, this one is still
enforced.
This commit is contained in:
Willy Tarreau 2014-05-21 15:04:05 +02:00
parent db58b79ccd
commit f4e38b36b8
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/dumpstats.c
View File

@ -3594,25 +3594,41 @@ static int stats_dump_proxy_to_buffer(struct stream_interface *si, struct proxy
while (svs->track)
svs = svs->track;
/* FIXME: produce some small strings for "UP/DOWN x/y &#xxxx;" */
if (!(svs->check.state & CHK_ST_ENABLED))
sv_state = 8;
else if (svs->state != SRV_ST_STOPPED) {
if (svs->check.health == svs->check.rise + svs->check.fall - 1)
sv_state = 3; /* UP */
if (sv->state == SRV_ST_RUNNING || sv->state == SRV_ST_STARTING) {
/* server is UP. The possibilities are :
* - UP, draining, going down => state = 6
* - UP, going down => state = 2
* - UP, draining => state = 7
* - UP, checked => state = 3
* - UP, not checked nor tracked => state = 8
*/
if ((svs->check.state & CHK_ST_ENABLED) &&
(svs->check.health < svs->check.rise + svs->check.fall - 1))
sv_state = 2;
else
sv_state = 2; /* going down */
sv_state = 3;
if (server_is_draining(sv))
sv_state += 4;
else if (svs->state == SRV_ST_STOPPING)
sv_state += 2;
if (sv_state == 3 && !(svs->check.state & CHK_ST_ENABLED))
sv_state = 8; /* unchecked UP */
}
else
if (svs->check.health)
sv_state = 1; /* going up */
else if (sv->state == SRV_ST_STOPPING) {
if ((!(sv->check.state & CHK_ST_ENABLED) && !sv->track) ||
(svs->check.health == svs->check.rise + svs->check.fall - 1))
sv_state = 5; /* NOLB */
else
sv_state = 4; /* NOLB going down */
}
else { /* stopped */
if ((svs->check.state & CHK_ST_ENABLED && !svs->check.health) ||
(svs->agent.state & CHK_ST_ENABLED && !svs->agent.health))
sv_state = 0; /* DOWN */
else
sv_state = 1; /* going up */
}
if (((sv_state == 0) || (sv->admin & SRV_ADMF_MAINT)) && (appctx->ctx.stats.flags & STAT_HIDE_DOWN)) {
/* do not report servers which are DOWN */