Author: rjung
Date: Tue Dec 23 13:22:03 2014
New Revision: 1647570

URL: http://svn.apache.org/r1647570
Log:
PR 50186: Docs: Clarify relation between
"connection_pool_timeout" and "keepAliveTimeout"
or "connectionTimeout" in the Tomcat AJP connector
configuration.

Modified:
    tomcat/jk/trunk/conf/workers.properties
    tomcat/jk/trunk/native/iis/installer/conf/workers.properties
    tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
    tomcat/jk/trunk/xdocs/reference/workers.xml

Modified: tomcat/jk/trunk/conf/workers.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/conf/workers.properties?rev=1647570&r1=1647569&r2=1647570&view=diff
==============================================================================
--- tomcat/jk/trunk/conf/workers.properties (original)
+++ tomcat/jk/trunk/conf/workers.properties Tue Dec 23 13:22:03 2014
@@ -139,7 +139,8 @@ worker.template.connection_pool_minsize=
 # - connection_pool_timeout: seconds, default=0
 #   Idle time, before a connection is eligible
 #   for being closed (pool shrinking).
-#   This should be the same value as connectionTimeout
+#   This should be the same value as keepAliveTimeout
+#   (if it is set explicitly) or connectionTimeout
 #   in the Tomcat AJP connector, but there it is
 #   milliseconds, here seconds.
 worker.template.connection_pool_timeout=600

Modified: tomcat/jk/trunk/native/iis/installer/conf/workers.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/workers.properties?rev=1647570&r1=1647569&r2=1647570&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/conf/workers.properties (original)
+++ tomcat/jk/trunk/native/iis/installer/conf/workers.properties Tue Dec 23 
13:22:03 2014
@@ -139,7 +139,8 @@ worker.template.connection_pool_minsize=
 # - connection_pool_timeout: seconds, default=0
 #   Idle time, before a connection is eligible
 #   for being closed (pool shrinking).
-#   This should be the same value as connectionTimeout
+#   This should be the same value as keepAliveTimeout
+#   (if it is set explicitly) or connectionTimeout
 #   in the Tomcat AJP connector, but there it is
 #   milliseconds, here seconds.
 worker.template.connection_pool_timeout=600

Modified: tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml?rev=1647570&r1=1647569&r2=1647570&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml Tue Dec 23 13:22:03 2014
@@ -197,11 +197,13 @@ The default value is "0", which disables
 <p>
 We generally recommend values around 10 minutes, so setting
 <b>connection_pool_timeout</b> to 600 (seconds). If you use this attribute,
-please also set the attribute <b>connectionTimeout</b> in the AJP
+please also set the attribute <b>keepAliveTimeout</b>
+(if it is set explicitly) or <b>connectionTimeout</b> in the AJP
 Connector element of your Tomcat server.xml configuration file to
-an analogous value. <b>Caution</b>: connectionTimeout is in milliseconds.
-So if you set JK connection_pool_timeout to 600, you should set Tomcat
-connectionTimeout to 600000.
+an analogous value. <b>Caution</b>: <b>keepAliveTimeout</b> and
+<b>connectionTimeout</b> must be given in milliseconds.
+So if you set JK <b>connection_pool_timeout</b> to 600, you should set Tomcat
+<b>keepAliveTimeout</b> or <b>connectionTimeout</b> to 600000.
 </p>
 <p>
 JK connections do not get closed immediately after the timeout passed.
@@ -253,8 +255,9 @@ it detects the missing TCP ACKs and trie
 a relatively long time, typically several minutes.
 Therefore you should always use
 <a href="#Connection Pools and Idle Timeouts">connection_pool_timeout and
-connection_pool_minsize</a> on the JK side and <b>connectionTimeout</b>
-on the Tomcat side to prevent idle connection drop.
+connection_pool_minsize</a> on the JK side and <b>keepAliveTimeout</b>
+or <b>connectionTimeout</b> on the Tomcat side to prevent idle
+connection drop.
 </p>
 <p>
 Furthermore using the boolean attribute <b>socket_keepalive</b> you can

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1647570&r1=1647569&r2=1647570&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Dec 23 13:22:03 2014
@@ -97,6 +97,11 @@
         <bug>56770</bug>: AJP: Add worker name to all log messages.
         Patch contributed by Martin Knoblauch. (rjung)
       </add>
+      <fix>
+        <bug>50186</bug>: Docs: Clarify relation between
+        "connection_pool_timeout" and "keepAliveTimeout" or "connectionTimeout"
+        in the Tomcat AJP connector configuration. (rjung)
+      </fix>
     </changelog>
   </subsection>
 </section>

Modified: tomcat/jk/trunk/xdocs/reference/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1647570&r1=1647569&r2=1647570&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/workers.xml Tue Dec 23 13:22:03 2014
@@ -408,7 +408,8 @@ to handle high-load, even it the child/t
 finish having many unused ajp13 threads on the Tomcat side.
 </p>
 <p>
-You should keep this time interval in sync with the <b>connectionTimeout</b> 
attribute
+You should keep this time interval in sync with the <b>keepAliveTimeout</b> 
attribute
+(if it is set explicitly) or <b>connectionTimeout</b> attribute
 of your AJP connector in Tomcat's server.xml. Note however, that the value
 for mod_jk is given in seconds, the one in server.xml has to use milliseconds.
 </p>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to