Author: rjung
Date: Fri Mar 6 13:58:41 2009
New Revision: 750900
URL: http://svn.apache.org/viewvc?rev=750900&view=rev
Log:
Set global worker state of an lb member to error
when we reach max_reply_timeouts, or
fail_on_status triggered a hard error.
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=750900&r1=750899&r2=750900&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Fri Mar 6 13:58:41
2009
@@ -1295,12 +1295,7 @@
* Failing over to another node could help.
*/
rec->s->errors++;
- if (rec->s->busy) {
- rec->s->state = JK_LB_STATE_OK;
- }
- else {
- rec->s->state = JK_LB_STATE_ERROR;
- }
+ rec->s->state = JK_LB_STATE_ERROR;
p->states[rec->i] = JK_LB_STATE_ERROR;
rec->s->error_time = time(NULL);
rc = JK_FALSE;
@@ -1312,12 +1307,7 @@
* Take this node out of service.
*/
rec->s->errors++;
- if (rec->s->busy) {
- rec->s->state = JK_LB_STATE_OK;
- }
- else {
- rec->s->state = JK_LB_STATE_ERROR;
- }
+ rec->s->state = JK_LB_STATE_ERROR;
p->states[rec->i] = JK_LB_STATE_ERROR;
rec->s->error_time = time(NULL);
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750900&r1=750899&r2=750900&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Mar 6
13:58:41 2009
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ LB: Set global worker state to error when we reach max_reply_timeouts,
+ or fail_on_status triggered hard error. (rjung)
+ </fix>
<update>
JNI: Deprecate JNI workers. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
