Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 64661 invoked from network); 19 Sep 2008 10:40:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Sep 2008 10:40:00 -0000 Received: (qmail 26683 invoked by uid 500); 19 Sep 2008 10:39:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 26398 invoked by uid 500); 19 Sep 2008 10:39:51 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 26385 invoked by uid 99); 19 Sep 2008 10:39:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 03:39:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 10:39:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 96F60238899E; Fri, 19 Sep 2008 03:39:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r697040 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/tcp/ webapps/docs/ webapps/docs/config/ Date: Fri, 19 Sep 2008 10:39:03 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080919103903.96F60238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Sep 19 03:39:02 2008 New Revision: 697040 URL: http://svn.apache.org/viewvc?rev=697040&view=rev Log: Add in startup options to the cluster channel. Document the multicast recovery options Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 19 03:39:02 2008 @@ -1 +1 @@ -/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,695053 +/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,695053,695311 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 03:39:02 2008 @@ -42,12 +42,6 @@ and seems impossible to anticipate): https://issues.apache.org/bugzilla/show_bug.cgi?id=36155#c17 -* Add in startup options, so that cluster can be started in TCP mode only, when using static membership - Also document the multicast recovery options - http://svn.apache.org/viewvc?rev=674125&view=rev - +1: fhanik, markt, funkman - -1: - * Fix comet behavior Invoke READ when there is a body and make sure END is called if CometEvent.close is called during an invokation http://svn.apache.org/viewvc?rev=677473&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Sep 19 03:39:02 2008 @@ -178,6 +178,8 @@ private Map properties = new HashMap(); private int channelSendOptions = Channel.SEND_OPTIONS_ASYNCHRONOUS; + + private int channelStartOptions = Channel.DEFAULT; // ------------------------------------------------------------- Properties @@ -666,7 +668,7 @@ registerClusterValve(); channel.addMembershipListener(this); channel.addChannelListener(this); - channel.start(channel.DEFAULT); + channel.start(channelStartOptions); if (clusterDeployer != null) clusterDeployer.start(); this.started = true; // Notify our interested LifecycleListeners @@ -760,7 +762,7 @@ this.managers.clear(); try { if ( clusterDeployer != null ) clusterDeployer.setCluster(null); - channel.stop(Channel.DEFAULT); + channel.stop(channelStartOptions); channel.removeChannelListener(this); channel.removeMembershipListener(this); this.unregisterClusterValve(); @@ -938,4 +940,12 @@ public String getProtocol() { return null; } + + public int getChannelStartOptions() { + return channelStartOptions; + } + + public void setChannelStartOptions(int channelStartOptions) { + this.channelStartOptions = channelStartOptions; + } } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 03:39:02 2008 @@ -85,14 +85,26 @@ + + + + Provide TCP only start-up option when using static membership. (fhanik) + + + Document the multicast recovery options. (fhanik) + + +
- 42727: Correctly handle request lines that are exact multiples of 4096 in length. - Patch provided by Will Pugh. - 42678: Only ignore docBase it it really is a subdir of + 42727: Correctly handle request lines that are exact + multiples of 4096 in length. Patch provided by Will Pugh. (markt) + + + 42678: Only ignore docBase if it really is a subdir of appBase. Patch provided by juergen. (markt) Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml Fri Sep 19 03:39:02 2008 @@ -125,6 +125,28 @@ If a value smaller or equal to 0 is presented, the code will default this value to frequency

+ +

+ In case of a network failure, Java multicast socket don't transparently fail over, instead the socket will continously + throw IOException upon each receive request. When recoveryEnabled is set to true, this will close the multicast socket + and open a new socket with the same properties as defined above.
+ The default is true.
+

+ + +

+ When recoveryEnabled==true this value indicates how many times we will try recovery. + The default is 10.
+

+ + +

+ When recoveryEnabled==true this value indicates how long time (in milliseconds) + the system will sleep in between recovery attempts, until we either recovered successfully or we have reached the + recoveryCounter limit. + The default is 5000 (5 seconds).
+

+ Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml Fri Sep 19 03:39:02 2008 @@ -90,10 +90,10 @@ The send buffer size on the socket. Default value is 43800 bytes. - + Possible values are true or false. - Set to true if you want the receiver to use direct bytebuffers when reading data - from the sockets. Default value is false + Set to true if you want the receiver to use direct bytebuffers when writing data + to the sockets. Default value is false The number of requests that can go through the socket before the socket is closed, and reopened @@ -105,7 +105,10 @@ Sets the SO_TIMEOUT option on the socket. The value is in milliseconds and the default value is 3000 - milliseconds. + milliseconds.(3 seconds) This timeout starts when a message send attempt is starting, until the transfer has been completed. + For the NIO sockets, this will mean, that the caller can guarantee that we will not attempt sending the message + longer than this timeout value. For the blocking IO implementation, this translated directly to the soTimeout.
+ A timeout will not spawn a retry attempt, in order to guarantee the return of the application thread. How many times do we retry a failed message, that received a IOException at the socket level. Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml?rev=697040&r1=697039&r2=697040&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml Fri Sep 19 03:39:02 2008 @@ -124,6 +124,18 @@ So to use ACK and ASYNC messaging, the flag would be 10 (8+2) or 0x000B

 + +

Sets the start and stop flags for the <Channel> object used by the cluster. + The default is Channel.DEFAULT which starts all the channel services, such as + sender, receiver, multicast sender and multicast receiver. + The following flags are available today: + + Channel.DEFAULT = Channel.SND_RX_SEQ (1)| Channel.SND_TX_SEQ (2)| Channel.MBR_RX_SEQ (4)| Channel.MBR_TX_SEQ (8); + + To start a channel without multicasting, you would want to use the value Channel.SND_RX_SEQ | Channel.SND_TX_SEQ + that equals to 3. +

+

Enable this flag don't forget to disable the channel heartbeat thread. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org