upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-11 18:07:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[MINOR] spread checks also when the server is OK.

Browse source 
Initial patch only managed to spread the checks when the checks
failed. The randomization code needs to be added also in the path
where the server is going fine.
This commit is contained in:
Willy Tarreau 2007-10-14 23:47:04 +02:00
parent ea845b5364
commit bbbc2deb29
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/checks.c
View file

@ -491,8 +491,14 @@ void process_chk(struct task *t, struct timeval *next)
}
s->curfd = -1; /* no check running anymore */
fd_delete(fd);
while (tv_isle(&t->expire, &now))
tv_ms_add(&t->expire, &t->expire, s->inter);
rv = 0;
if (global.spread_checks > 0) {
rv = s->inter * global.spread_checks / 100;
rv -= (int) (2 * rv * (rand() / (RAND_MAX + 1.0)));
//fprintf(stderr, "process_chk(%p): (%d+/-%d%%) random=%d\n", s, s->inter, global.spread_checks, rv);
}
tv_ms_add(&t->expire, &now, s->inter + rv);
goto new_chk;
}
else if (s->result < 0 || tv_isle(&t->expire, &now)) {
@ -511,10 +517,9 @@ void process_chk(struct task *t, struct timeval *next)
if (global.spread_checks > 0) {
rv = s->inter * global.spread_checks / 100;
rv -= (int) (2 * rv * (rand() / (RAND_MAX + 1.0)));
//fprintf(stderr, "process_chk: (%d+/-%d%%) random=%d\n", s->inter, global.spread_checks, rv);
//fprintf(stderr, "process_chk(%p): (%d+/-%d%%) random=%d\n", s, s->inter, global.spread_checks, rv);
}
while (tv_isle(&t->expire, &now))
tv_ms_add(&t->expire, &t->expire, s->inter + rv);
tv_ms_add(&t->expire, &now, s->inter + rv);
goto new_chk;
}
/* if result is 0 and there's no timeout, we have to wait again */