diff options
| author | Paul Querna <pquerna@apache.org> | 2008-12-05 09:50:08 +0100 |
|---|---|---|
| committer | Paul Querna <pquerna@apache.org> | 2008-12-05 09:50:08 +0100 |
| commit | 8b2f6257e497843e3d42520cb88b0a66895ba543 (patch) | |
| tree | 30243cca7bbd289c8fbbe03a6e947ecb9911569c /modules/cluster/mod_heartbeat.c | |
| parent | Make hb_ctx_t:keep_running volatile. (diff) | |
| download | apache2-8b2f6257e497843e3d42520cb88b0a66895ba543.tar.xz apache2-8b2f6257e497843e3d42520cb88b0a66895ba543.zip | |
Don't overcount busy servers from previous generations.
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723661 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cluster/mod_heartbeat.c')
| -rw-r--r-- | modules/cluster/mod_heartbeat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/cluster/mod_heartbeat.c b/modules/cluster/mod_heartbeat.c index 4457a97b62..0f14e9b644 100644 --- a/modules/cluster/mod_heartbeat.c +++ b/modules/cluster/mod_heartbeat.c @@ -73,7 +73,8 @@ static int hb_monitor(hb_ctx_t *ctx, apr_pool_t *p) ready++; } else if (res != SERVER_DEAD && - res != SERVER_STARTING && res != SERVER_IDLE_KILL) { + res != SERVER_STARTING && res != SERVER_IDLE_KILL && + ps->generation == ap_my_generation) { busy++; } } |