Author: pero
Date: Thu Oct 19 14:37:51 2006
New Revision: 465902

URL: http://svn.apache.org/viewvc?view=rev&rev=465902
Log:
Disable recover feature as default.
add little documentation

Modified:
    
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
    
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
    tomcat/container/tc5.5.x/webapps/docs/cluster-howto.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?view=diff&rev=465902&r1=465901&r2=465902
==============================================================================
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
 Thu Oct 19 14:37:51 2006
@@ -76,7 +76,7 @@
     /**
      * number of recover tries
      */
-    private int recoverCounter = 5;
+    private int recoverCounter = 0;
 
     /**
      * Count number of queue message

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?view=diff&rev=465902&r1=465901&r2=465902
==============================================================================
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 Thu Oct 19 14:37:51 2006
@@ -624,7 +624,7 @@
           description="recover Timeout after push message failure (default 
5000 msec)"
                  type="long" />
     <attribute   name="recoverCounter"
-          description="number of recover tries (default 5)"
+          description="number of recover tries (default 0 - means off)"
                  type="int" />
     <attribute   name="connected"
                  is="true"

Modified: tomcat/container/tc5.5.x/webapps/docs/cluster-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/cluster-howto.xml?view=diff&rev=465902&r1=465901&r2=465902
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/cluster-howto.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/cluster-howto.xml Thu Oct 19 14:37:51 
2006
@@ -338,7 +338,7 @@
         /&gt;
         &lt;Engine            name="Catalina" 
                    defaultHost="localhost" 
-                        jvmRoute="node1"&gt;
+                        jvmRoute="node01"&gt;
         &lt;Realm        
className="org.apache.catalina.realm.UserDatabaseRealm"
                    resourceName="UserDatabase" /&gt;
             &lt;Host          name="localhost"
@@ -491,6 +491,8 @@
                   &lt;Sender
                                            
className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
                                      replicationMode="fastasyncqueue"
+                                      recoverTimeout="5000"
+                                      recoverCounter="6"
                         doTransmitterProcessingStats="true"
                                    doProcessingStats="true"
                                       doWaitAckStats="true"
@@ -557,7 +559,7 @@
   <tr>
     <td>ackTimeout</td>
     <td>acknowledge timeout and only usefull it waitForAck is true</td>
-    <td><code>15000</code></td>
+    <td><code>15000 msec</code></td>
   </tr>
   
   <tr>
@@ -608,7 +610,7 @@
   <tr>
     <td>keepAliveTimeout</td>
     <td>active socket keep alive timeout</td>
-    <td><code>60000</code></td>
+    <td><code>60000 msec</code></td>
   </tr>  
 
   <tr>
@@ -636,6 +638,18 @@
   </tr>
 
   <tr>
+    <td>recoverTimeout</td>
+    <td>recover Timeout after push message failure </td>
+    <td><code>5000 msec</code></td>
+  </tr>
+
+  <tr>
+    <td>recoverCounter</td>
+    <td>number of recover tries</td>
+    <td><code>0</code></td>
+  </tr>
+
+  <tr>
     <td>queueDoStats</td>
     <td>activated queue stats</td>
     <td><code>false</code></td>
@@ -649,12 +663,12 @@
   <tr>
     <td>queueAddWaitTimeout</td>
     <td>queue add wait time (tomcat connector thread waits)</td>
-    <td><code>10000</code></td>
+    <td><code>10000 msec</code></td>
   </tr>
   <tr>
     <td>queueRemoveWaitTimeout</td>
     <td>queue remove wait time (queue thread waits)</td>
-    <td><code>30000</code></td>
+    <td><code>30000 msec</code></td>
   </tr>
   
   <tr>
@@ -672,17 +686,20 @@
   
 </p>
 <p>
-Example to get a lot of statistic information and no wait for ACK<br/>
+Example to get a lot of statistic information, wait for ACK and
+recover after connection failure (wait 5 secs and 6 trails (==30 secs Mcast 
Timeout) <br/>
 <source>
     &lt;Sender
       className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
       replicationMode="fastasyncqueue"
+      recoverTimeout="5000"
+      recoverCounter="6"      
       doTransmitterProcessingStats="true"
       doProcessingStats="true"
       queueTimeWait="true"
       queueDoStats="true"
       queueCheckLock="true"
-      waitForAck="false"
+      waitForAck="true"
       autoConnect="false"
       keepAliveTimeout="320000"
       keepAliveMaxRequestCount="-1"/&gt;
@@ -704,7 +721,7 @@
   <tr>
     <td>keepAliveTimeout</td>
     <td>active socket keep alive timeout</td>
-    <td><code>60000</code></td>
+    <td><code>60000 msec</code></td>
   </tr>  
 
   <tr>
@@ -764,7 +781,7 @@
   <tr>
     <td>keepAliveTimeout</td>
     <td>active socket keep alive timeout</td>
-    <td><code>60000</code></td>
+    <td><code>60000 msec</code></td>
   </tr>  
 
   <tr>
@@ -821,7 +838,7 @@
   <tr>
     <td>keepAliveTimeout</td>
     <td>active socket keep alive timeout</td>
-    <td><code>60000</code></td>
+    <td><code>60000 msec</code></td>
   </tr>  
 
   <tr>
@@ -900,7 +917,7 @@
     <td>stateTransferTimeout</td>
     <td>Timeout that session state transfer is complete. Is attribute 
<code>stateTransferTimeout == -1</code> 
         then application wait that other node send the complete session 
state</td>
-    <td><code>60</code></td>
+    <td><code>60 sec</code></td>
   </tr>
   
   <tr>
@@ -918,7 +935,7 @@
   <tr>
     <td>sendAllSessionsWaitTime</td>
     <td>wait time between two session send blocks.</td>
-    <td><code>2000</code></td>
+    <td><code>2000 msec</code></td>
   </tr>
 
   <tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to