You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2012/01/31 22:49:24 UTC
svn commit: r1238823 - in /tomcat/jk/trunk: native/common/jk_lb_worker.c
xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Tue Jan 31 21:49:23 2012
New Revision: 1238823
URL: http://svn.apache.org/viewvc?rev=1238823&view=rev
Log:
BZ 52567: Balancer member in recovery state can switch
back into error state if it is idle.
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1238823&r1=1238822&r2=1238823&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Tue Jan 31 21:49:23 2012
@@ -583,7 +583,8 @@ static int recover_workers(lb_worker_t *
}
}
else if (w->s->error_time > 0 &&
- (int)difftime(now, w->s->error_time) >= p->error_escalation_time) {
+ (int)difftime(now, w->s->error_time) >= p->error_escalation_time &&
+ w->s->state != JK_LB_STATE_RECOVER) {
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"worker %s escalating local error to global error",
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1238823&r1=1238822&r2=1238823&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Jan 31 21:49:23 2012
@@ -44,6 +44,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>52567</bug>: Balancer member in recovery state can switch
+ back into error state if it is idle. (rjung)
+ </fix>
<update>
Log error if unable to load URI workermap file, and improve logging
of unreadable worker files on IIS. (timw)
@@ -54,18 +58,18 @@
<fix>
<bug>51253</bug>: Forward WWW-Authenticate header when using
server generated error pages (rjung, mturk).
- </fix>
+ </fix>
<update>
<bug>46406</bug>: IIS: Support relative paths in configuration.
The paths are presumed to be relative from isapi_redirect.dll. (mturk)
- </update>
+ </update>
<fix>
<bug>50233</bug>: Do not use hard limit on uri size (mturk).
- </fix>
+ </fix>
<update>
IIS: Use Windows Server 2003 SP1, Windows XP SP2 as minimal
version supported. (mturk)
- </update>
+ </update>
<fix>
<bug>47038</bug>: Fix compiler warning when using --enable-flock
for configure. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org