Author: mturk
Date: Sat Mar 7 14:19:23 2009
New Revision: 751275
URL: http://svn.apache.org/viewvc?rev=751275&view=rev
Log:
Revert the in_error counter
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=751275&r1=751274&r2=751275&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Mar 7
14:19:23 2009
@@ -2124,8 +2124,6 @@
aw->s->transferred += e->wr;
if (aw->s->busy)
aw->s->busy--;
- if (aw->s->in_error)
- aw->s->in_error--;
if (rc == JK_TRUE) {
aw->s->state = JK_AJP_STATE_OK;
}
@@ -2136,7 +2134,6 @@
else {
aw->s->state = JK_AJP_STATE_ERROR;
aw->s->errors++;
- aw->s->in_error++;
aw->s->error_time = time(NULL);
}
}
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=751275&r1=751274&r2=751275&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Mar 7 14:19:23
2009
@@ -1340,7 +1340,7 @@
* Time for fault tolerance (if possible)...
*/
rec->s->errors++;
- if (rec->s->busy && (rec->s->busy / 2) > rec->in_errors) {
+ if (rec->s->busy) {
rec->s->state = JK_LB_STATE_OK;
}
else {
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=751275&r1=751274&r2=751275&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sat Mar 7 14:19:23 2009
@@ -98,8 +98,6 @@
volatile int busy;
/* Maximum number of busy channels */
volatile int max_busy;
- /* Number of currently channels in error state */
- volatile int in_error;
volatile time_t error_time;
/* Number of bytes read from remote */
volatile jk_uint64_t readed;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
