tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r423675 - in /tomcat/connectors/trunk/jk: conf/ native/ native/common/ native/iis/ tools/ xdocs/ xdocs/config/ xdocs/howto/ xdocs/news/
Date Thu, 20 Jul 2006 00:15:02 GMT
Author: rjung
Date: Wed Jul 19 17:15:01 2006
New Revision: 423675

URL: http://svn.apache.org/viewvc?rev=423675&view=rev
Log:
Preparing 1.2.18:
- increment version
- changelog
- added back doc for deprecated directives
- some doc for recover_time, added a few lines to worker.maintain
- replaced the deprecated directives in the default config
  (which is still very broken)
- changed directory structure in src-tarball (moved everything in jk/
  one directory up.

Modified:
    tomcat/connectors/trunk/jk/conf/workers.properties
    tomcat/connectors/trunk/jk/native/STATUS.txt
    tomcat/connectors/trunk/jk/native/common/portable.h.sample
    tomcat/connectors/trunk/jk/native/configure.in
    tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
    tomcat/connectors/trunk/jk/tools/jkrelease.sh
    tomcat/connectors/trunk/jk/xdocs/changelog.xml
    tomcat/connectors/trunk/jk/xdocs/config/workers.xml
    tomcat/connectors/trunk/jk/xdocs/howto/workers.xml
    tomcat/connectors/trunk/jk/xdocs/index.xml
    tomcat/connectors/trunk/jk/xdocs/news/20060101.xml

Modified: tomcat/connectors/trunk/jk/conf/workers.properties
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/conf/workers.properties?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/conf/workers.properties (original)
+++ tomcat/connectors/trunk/jk/conf/workers.properties Wed Jul 19 17:15:01 2006
@@ -110,8 +110,8 @@
 worker.ajp13.lbfactor=1
 
 #
-# Specify the size of the open connection cache.
-#worker.ajp13.cachesize
+# Specify the size of the open connection pool.
+#worker.ajp13.connection_pool_size
 
 #
 #------ DEFAULT LOAD BALANCER WORKER DEFINITION ----------------------

Modified: tomcat/connectors/trunk/jk/native/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/STATUS.txt (original)
+++ tomcat/connectors/trunk/jk/native/STATUS.txt Wed Jul 19 17:15:01 2006
@@ -3,8 +3,9 @@
 
 Release:
 
-    1.2.18  : in development
-    1.2.17  : released July, 2006
+    1.2.19  : in development
+    1.2.18  : released July, 2006
+    1.2.17  : not released
     1.2.16  : not released
     1.2.15  : released November 8, 2005
     1.2.14  : released July 13, 2005

Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Wed Jul 19 17:15:01 2006
@@ -90,4 +90,4 @@
 #define USE_SO_SNDTIMEO 1
 
 /* Version number of package */
-#define VERSION "1.2.17"
+#define VERSION "1.2.18"

Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Wed Jul 19 17:15:01 2006
@@ -11,7 +11,7 @@
 
 dnl package and version. (synchronization with common/jk_version.h ?)
 PACKAGE=mod_jk
-VERSION=1.2.17
+VERSION=1.2.18
 
 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
 

Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Wed Jul 19 17:15:01 2006
@@ -14,13 +14,13 @@
                     "specific language governing permissions and " \
                     "limitations under the License."
 
-#define JK_VERSION_STR  "1.2.17"
+#define JK_VERSION_STR  "1.2.18"
 #define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
 
 
 1 VERSIONINFO
- FILEVERSION 1,2,17,0
- PRODUCTVERSION 1,2,17,0
+ FILEVERSION 1,2,18,0
+ PRODUCTVERSION 1,2,18,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x01L

Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Wed Jul 19 17:15:01 2006
@@ -16,7 +16,7 @@
 # You need to change the version numbers
 JK_VERMAJOR="1"
 JK_VERMINOR="2"
-JK_VERFIX="17"
+JK_VERFIX="18"
 ASFROOT="http://svn.apache.org/repos/asf"
 JK_CVST="tomcat-connectors"
 
@@ -39,7 +39,7 @@
 umask 022
 
 rm -rf ${JK_DIST}
-rm -rf ${JK_DIST}.*
+rm -rf ${JK_DIST}.tmp
 
 mkdir -p ${JK_DIST}.tmp
 svn export "${JK_SVN_URL}/jk" ${JK_DIST}.tmp/jk
@@ -64,7 +64,7 @@
 done
 
 srcdir=${JK_DIST}.tmp/jk
-targetdir=${JK_DIST}/jk
+targetdir=${JK_DIST}
 mkdir -p ${targetdir}
 for item in ${COPY_JK}
 do
@@ -73,7 +73,7 @@
 done
 
 srcdir=${JK_DIST}.tmp/jk/build
-targetdir=${JK_DIST}/jk
+targetdir=${JK_DIST}
 mkdir -p ${targetdir}
 for item in docs
 do
@@ -82,7 +82,7 @@
 done
 
 srcdir=${JK_DIST}.tmp/jk/conf
-targetdir=${JK_DIST}/jk/conf
+targetdir=${JK_DIST}/conf
 mkdir -p ${targetdir}
 for item in ${COPY_CONF}
 do
@@ -91,7 +91,7 @@
 done
 
 # Remove extra directories and files
-targetdir=${JK_DIST}/jk
+targetdir=${JK_DIST}
 rm -rf ${targetdir}/xdocs/jk2
 rm -rf ${targetdir}/native/CHANGES.txt
 rm -rf ${targetdir}/native/build.xml
@@ -99,7 +99,7 @@
 find ${JK_DIST} -name CVS -exec rm -rf \{\} \; 
 find ${JK_DIST} -name .svn -exec rm -rf \{\} \; 
 
-cd ${JK_DIST}/jk/native
+cd ${JK_DIST}/native
 
 # Check for links, elinks or w3m
 W3MOPTS="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
@@ -155,7 +155,7 @@
 
 # Generate configure et. al.
 ./buildconf.sh
-cd ../../../
+cd ../../
 
 # Pack and sign
 tar cvf ${JK_DIST}.tar --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST}

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Wed Jul 19 17:15:01 2006
@@ -21,6 +21,19 @@
   new documentation project for JK was started.
   </p>
 </section>
+<section name="Changes from the released JK 1.2.18">
+  <br />
+  <subsection name="Native">
+    <changelog>
+      <fix>
+      Using socklen_t in getsockopt. Also introducing jk_sock_t. (mturk)
+      </fix>
+      <update>
+      Allow recovery wait time below 60 seconds (new minimum is 1 second). (mturk)
+      </update>
+    </changelog>
+  </subsection>
+</section>
 <section name="Changes from the released JK 1.2.17">
   <br />
   <subsection name="Native">

Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Wed Jul 19 17:15:01 2006
@@ -75,10 +75,15 @@
 worker.list property, these are also the workers to whom you can map requests.
 </directive>
 <directive name="worker.maintain" default="60" required="false">
-Worker connection pool maintain timeout in seconds. If set to the positive
+Worker connection pool maintain interval in seconds. If set to the positive
 value JK will scan all connections for all workers specified in worker.list
 directive and check if connections needs to be recycled.
 <p>
+Furthermore any load balancer does a global maintenance every worker.maintain
+seconds. During global maintenance load counters are decayed and workers
+in error are checked for recover_time.
+</p>
+<p>
 This feature has been added in <b>jk 1.2.13</b>.
 </p>
 </directive>
@@ -140,20 +145,12 @@
 </p>
 </directive>
 
-<directive name="recycle_timeout" default="0" required="false">
-<warn>This directive has been deprecated since 1.2.16. See <b>Connection Pool</b>
directives instead</warn>
-</directive>
-
 <directive name="retries" default="3" required="false">
 The number of retries that the worker will try in case of error returned from remote
 Tomcat. If the number of retries set is greater then three (the default value), on
 each retry after default an extra wait of 100ms will be inserted.
 </directive>
 
-<directive name="cachesize" default="1" required="false">
-<warn>This directive has been deprecated since 1.2.16. See <b>connection_pool_size</b>
instead</warn>
-</directive>
-
 <directive name="connection_pool_size" default="1" required="false">
 This defines the number of connections made to the AJP backend that
 are maintained as a connection pool.
@@ -161,13 +158,13 @@
 process can made.
 <p>
 Connection pool size property is used only for multi threaded
-web servers such as Apache 2.0 (worker), IIS and Netscape. The cachesize property
+web servers such as Apache 2.0 (worker), IIS and Netscape. The connection_pool_size property
 should reflect the number of threads per child process. JK will discover
 the number of threads per child process on Apache 2 web server with worker-mpm and set
 its default value to match the ThreadsPerChild Apache directive. For IIS the default
 value is 10. For other web servers this value has to be set manually.
 </p>
-<warn>Do not use cachesize with values higher then 1 on <b>Apache 2.x prefork</b>
or <b>Apache 1.3.x</b>!</warn>
+<warn>Do not use connection_pool_size with values higher then 1 on <b>Apache
2.x prefork</b> or <b>Apache 1.3.x</b>!</warn>
 </directive>
 
 <directive name="connection_pool_minsize" default="pool/2" required="false">
@@ -198,10 +195,6 @@
 </p>.
 </directive>
 
-<directive name="cache_timeout" default="0" required="false">
-<warn>This directive has been deprecated since 1.2.16. See <b>connection_pool_timeout</b>
instead</warn>
-</directive>
-
 <directive name="lbfactor" default="1" required="false">
 Integer number used when the worker will be used inside load balancer worker,
 this is the load-balancing factor for the worker.
@@ -212,6 +205,58 @@
 </directive>
 
 </directives>
+
+<p>Some directives have been deprecated in the past. We include their documentation
+in case you need to use an older version of mod_jk. We urge you to update and not use
+them any more. Please migrate your existing configurations.
+</p>
+<directives>
+<directive name="recycle_timeout" default="0" required="false">
+<warn>This directive has been deprecated since 1.2.16. See <b>connection_pool_timeout</b>
instead.</warn>
+The number of seconds that told webserver to cut an ajp13 connection after some time of 
+inactivity. When choosing an endpoint for a request and the assigned socket is open, it will
be
+closed if it was not used for the configured time.
+It's a good way to ensure that there won't too old threads living on Tomcat side, 
+with the extra cost you need to reopen the socket next time a request be forwarded.
+This property is very similar to <b>cache_timeout</b> but works also in non-cache
mode.
+If set to value zero (default) no recycle will took place. 
+</directive>
+
+<directive name="cache_timeout" default="0" required="false">
+<warn>This directive has been deprecated since 1.2.16. See <b>connection_pool_timeout</b>
instead.</warn>
+Cache timeout property should be used with <b>cachesize</b> to specify how to
time JK should keep
+an open socket in cache before closing it. This property should be used to reduce the number
of threads 
+on the Tomcat WebServer.
+<p> 
+Each child could open an ajp13 connection if it have to forward a request to Tomcat, creating
+a new ajp13 thread on Tomcat side.
+</p>
+<p>
+The problem is that after an ajp13 connection is created, the child won't drop it
+until killed. And since the webserver will keep its childs/threads running
+to handle high-load, even it the child/thread handle only static contents, you could
+finish having many unused ajp13 threads on the Tomcat side.
+</p>. 
+</directive>
+
+<directive name="cachesize" default="1" required="false">
+<warn>This directive has been deprecated since 1.2.16. See <b>connection_pool_size</b>
instead.</warn>
+Cachesize defines the number of connections made to the AJP backend that
+are maintained as a connection pool.
+It will limit the number of those connection that each web server child
+process can made.
+<p>
+Cachesize property is used only for multi threaded 
+web servers such as Apache 2.0 (worker), IIS and Netscape. The cachesize property
+should reflect the number of threads per child process. JK will discover
+the number of threads per child process on Apache 2 web server with worker-mpm and set
+its default value to match the ThreadsPerChild Apache directive. For IIS the default
+value is 10. For other web servers this value has to be set manually.
+</p>
+<warn>Do not use cachesize with values higher then 1 on <b>Apache 2.x prefork</b>
or <b>Apache 1.3.x</b>!</warn>
+</directive>
+</directives>
+
 </subsection>
 
 <subsection name="Load balancing directives">
@@ -369,6 +414,22 @@
 This features has been added in <b>jk 1.2.6</b> to avoid problem with hung tomcat's
and works on all
 servlet engines supporting ajp13.
 Disabled by default.
+</p>
+</directive>
+
+<directive name="recover_time" default="60" required="false">
+The recover time is the time in seconds the load balancer will not try
+to use a worker, after it went into error state. Only after this time has passed,
+a worker in error state will be marked as in recovering, so that it will be
+tried for new requests.
+<p>
+This interval is not checked every time a request is being processed.
+Instead it is being checked during global maintenance. The time between two
+runs of global maintenance is controlled by worker.maintain.
+</p>
+<p>
+Do not set recover_time to a very short time unless you understand the implications.
+Every recovery attempt for a worker in error is done by a real request!
 </p>
 </directive>
 

Modified: tomcat/connectors/trunk/jk/xdocs/howto/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/howto/workers.xml?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/howto/workers.xml Wed Jul 19 17:15:01 2006
@@ -217,13 +217,11 @@
   worker.worker2.host=www2.x.com
   worker.worker2.port=8009
   worker.worker2.lbfactor=3
-  # worker "worker2" use up to 10 sockets, which will stay no more than 10mn in cache
-  worker.worker2.cachesize=10
-  worker.worker2.cache_timeout=600
+  # worker "worker2" use up to 10 sockets, which will stay no more than 10mn in the connection
pool
+  worker.worker2.connection_pool_size=10
+  worker.worker2.connection_pool_timeout=600
   # worker "worker2" ask operating system to send KEEP-ALIVE signal on the connection
   worker.worker2.socket_keepalive=1
-  # worker "worker2" want ajp13 connection to be dropped after 5mn (recycle)
-  worker.worker2.recycle_timeout=300
   # mount can be used as an alternative to the JkMount directive
   worker.worker2.mount=/contexta /contexta/* /contextb /contextb/*
 </source>
@@ -423,8 +421,8 @@
   worker.worker2.host=locahost
   worker.worker2.port=8009
   worker.worker2.lbfactor=1
-  worker.worker2.cachesize=10
-  worker.worker2.cache_timeout=600
+  worker.worker2.connection_pool_size=10
+  worker.worker2.connection_pool_timeout=600
   worker.worker2.socket_keepalive=1
   worker.worker2.socket_timeout=60
   # Set properties for worker3 (jni)

Modified: tomcat/connectors/trunk/jk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/index.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/index.xml Wed Jul 19 17:15:01 2006
@@ -28,19 +28,26 @@
 <section name="Headlines">
 <br />
 <ul>
-<li><a href="news/20060101.html#20060708.1"><b>JK-1.2.17 released</b></a>
+<li><a href="news/20060101.html#20060720.1"><b>JK-1.2.18 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Connectors 1.2.17 Stable.
+of Tomcat Connectors 1.2.18 Stable.
 </p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.17/tomcat-connectors-1.2.17-src.tar.gz">JK
1.2.17 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.17/tomcat-connectors-1.2.17-src.tar.gz.asc">PGP
signature</a>
+<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.18/tomcat-connectors-1.2.18-src.tar.gz">JK
1.2.18 release sources</a>
+ | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.18/tomcat-connectors-1.2.18-src.tar.gz.asc">PGP
signature</a>
 </p>
 <p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a>
for selected platforms.
 </p>
 </li>
 
+<li><a href="news/20060101.html#20060708.1"><b>JK-1.2.17 not released</b></a>
+<p>Version 1.2.17 of Tomcat Connectors has not been released due to a bug in socket
function argument types.
+</p>
+<p>Thanks to all testers for their feedback. All reported new errors have been fixed
in Version 1.2.18.
+</p>
+</li>
+
 <li><a href="news/20060101.html#20060629.1"><b>JK-1.2.16 not released</b></a>
-<p>Version 1.2.16 of Tomcat Connectors 1.2.16 has not been released due to a bug in
the jk status worker.
+<p>Version 1.2.16 of Tomcat Connectors has not been released due to a bug in the jk
status worker.
 </p>
 <p>Thanks to all testers for their feedback. All reported new errors have been fixed
in Version 1.2.17.
 </p>

Modified: tomcat/connectors/trunk/jk/xdocs/news/20060101.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20060101.xml?rev=423675&r1=423674&r2=423675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/news/20060101.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20060101.xml Wed Jul 19 17:15:01 2006
@@ -15,11 +15,11 @@
 
 <section name="2006 News &amp; Status">
 <br />
-<a name="20060708.1"> 
-<h3>JK-1.2.17 released</h3>
+<a name="20060720.1"> 
+<h3>JK-1.2.18 released</h3>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Connectors 1.2.17. This is a stable release adding
-a few bug fixes to the not released 1.2.16 version.
+of Tomcat Connectors 1.2.18. This is a stable release adding
+a few bug fixes to the not released 1.2.17 version.
 </p>
 <p>
  Please see the <a href="../changelog.html">ChangeLog</a> for a full list of
changes.
@@ -27,6 +27,17 @@
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
 Bug Report. When entering bug select <b>Native:JK</b> Component.
+</p>
+</a>
+<hr size="1" noshade="noshade" />
+
+<a name="20060708.1"> 
+<h3>JK-1.2.17 not released</h3>
+<p>Version 1.2.17 of Tomcat Connectors 1.2.17 has not been released 
+due to a bug in the types chosen for socket arguments.
+</p>
+<p>
+ Please see the <a href="../changelog.html">ChangeLog</a> for a full list of
changes.
 </p>
 </a>
 <hr size="1" noshade="noshade" />



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


Mime
View raw message