Author: rjung
Date: Tue Mar 10 00:25:25 2009
New Revision: 751920
URL: http://svn.apache.org/viewvc?rev=751920&view=rev
Log:
Also check local to global error escalation
during maintenance.
Add debug logging to both places where we escalate.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=751920&r1=751919&r2=751920&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Tue Mar 10 00:25:25
2009
@@ -558,6 +558,14 @@
non_error++;
}
}
+ else if (w->s->error_time > 0 &&
+ (int)difftime(now, w->s->error_time) >=
p->error_escalation_time) {
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "worker %s escalating local error to global error",
+ w->name);
+ w->s->state = JK_LB_STATE_ERROR;
+ }
else {
non_error++;
if (w->s->state == JK_LB_STATE_OK &&
@@ -1346,6 +1354,10 @@
if (rec->s->busy == 0 ||
(rec->s->error_time > 0 &&
(int)difftime(now, rec->s->error_time) >=
p->worker->error_escalation_time)) {
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "worker %s escalating local error to global
error",
+ rec->name);
rec->s->state = JK_LB_STATE_ERROR;
}
p->states[rec->i] = JK_LB_STATE_ERROR;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
