Author: rjung
Date: Tue Mar 10 02:23:51 2009
New Revision: 751965
URL: http://svn.apache.org/viewvc?rev=751965&view=rev
Log:
Make forced recovery work with local error states
in LB worker.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
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=751965&r1=751964&r2=751965&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 02:23:51
2009
@@ -580,6 +580,7 @@
}
static int force_recovery(lb_worker_t *p,
+ int *states,
jk_logger_t *l)
{
unsigned int i;
@@ -598,6 +599,8 @@
aw = (ajp_worker_t *)w->worker->worker_private;
aw->s->reply_timeouts = 0;
w->s->state = JK_LB_STATE_FORCE;
+ if (states != NULL)
+ states[i] = JK_LB_STATE_FORCE;
forced++;
}
}
@@ -669,7 +672,7 @@
JK_LB_DECAY_MULT * delta / lb->maintain_time);
curmax = decay_load(lb, JK_LB_DECAY_MULT * delta /
lb->maintain_time, l);
if (!recover_workers(lb, curmax, now, l)) {
- force_recovery(lb, l);
+ force_recovery(lb, NULL, l);
}
}
@@ -1418,7 +1421,7 @@
* If it still fails, Tomcat is still disconnected.
*/
jk_shm_lock();
- nf = force_recovery(p->worker, l);
+ nf = force_recovery(p->worker, p->states, l);
jk_shm_unlock();
was_forced = 1;
if (nf) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=751965&r1=751964&r2=751965&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Mar 10
02:23:51 2009
@@ -43,6 +43,9 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ LB: make forced recovery work with local error states. (rjung)
+ </fix>
<update>
Status: Include error time in display. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
