Author: mturk
Date: Mon Oct 6 06:59:16 2008
New Revision: 702148
URL: http://svn.apache.org/viewvc?rev=702148&view=rev
Log:
Make retry_interval stored in shared memory and synced on push/pull
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=702148&r1=702147&r2=702148&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Oct 6
06:59:16 2008
@@ -976,6 +976,7 @@
aw->prepost_timeout = aw->s->prepost_timeout;
aw->recovery_opts = aw->s->recovery_opts;
aw->retries = aw->s->retries;
+ aw->retry_interval = aw->s->retry_interval;
aw->max_packet_size = aw->s->max_packet_size;
aw->sequence = aw->s->h.sequence;
@@ -998,6 +999,7 @@
aw->s->prepost_timeout = aw->prepost_timeout;
aw->s->recovery_opts = aw->recovery_opts;
aw->s->retries = aw->retries;
+ aw->s->retry_interval = aw->retry_interval;
aw->s->max_packet_size = aw->max_packet_size;
aw->s->h.sequence = aw->sequence;
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=702148&r1=702147&r2=702148&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Mon Oct 6 06:59:16
2008
@@ -297,6 +297,7 @@
p->recover_wait_time = p->s->recover_wait_time;
p->max_reply_timeouts = p->s->max_reply_timeouts;
p->retries = p->s->retries;
+ p->retry_interval = p->s->retry_interval;
p->lbmethod = p->s->lbmethod;
p->lblock = p->s->lblock;
p->max_packet_size = p->s->max_packet_size;
@@ -346,6 +347,7 @@
p->s->recover_wait_time = p->recover_wait_time;
p->s->max_reply_timeouts = p->max_reply_timeouts;
p->s->retries = p->retries;
+ p->s->retry_interval = p->retry_interval;
p->s->lbmethod = p->lbmethod;
p->s->lblock = p->lblock;
p->s->max_packet_size = p->max_packet_size;
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=702148&r1=702147&r2=702148&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Mon Oct 6 06:59:16 2008
@@ -86,6 +86,7 @@
int prepost_timeout;
unsigned int recovery_opts;
int retries;
+ int retry_interval;
unsigned int max_packet_size;
/* current error state (runtime) of the worker */
volatile int state;
@@ -163,6 +164,7 @@
int recover_wait_time;
int max_reply_timeouts;
int retries;
+ int retry_interval;
int lbmethod;
int lblock;
unsigned int max_packet_size;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
