[Jboss-cvs] JBossAS SVN: r55137 - trunk/tomcat/src/resources

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Aug 3 15:59:44 EDT 2006


Author: bstansberry at jboss.com
Date: 2006-08-03 15:59:44 -0400 (Thu, 03 Aug 2006)
New Revision: 55137

Modified:
   trunk/tomcat/src/resources/tc5-cluster-service.xml
   trunk/tomcat/src/resources/tc6-cluster-service.xml
Log:
Add FD_SOCK to commented-out configs

Modified: trunk/tomcat/src/resources/tc5-cluster-service.xml
===================================================================
--- trunk/tomcat/src/resources/tc5-cluster-service.xml	2006-08-03 19:57:32 UTC (rev 55136)
+++ trunk/tomcat/src/resources/tc5-cluster-service.xml	2006-08-03 19:59:44 UTC (rev 55137)
@@ -79,8 +79,9 @@
                       down_thread="false" up_thread="false" num_initial_members="3"/>
                 <MERGE2 max_interval="100000"
                         down_thread="false" up_thread="false" min_interval="20000"/>
-                <FD shun="true" up_thread="false" down_thread="false"
-                        timeout="2500" max_tries="5"/>
+	            <FD_SOCK down_thread="false" up_thread="false"/>
+	            <FD shun="true" up_thread="true" down_thread="true"
+	               timeout="20000" max_tries="5"/>
                 <VERIFY_SUSPECT timeout="1500"
                         up_thread="false" down_thread="false"/>
                 <pbcast.NAKACK max_xmit_size="60000"
@@ -128,9 +129,29 @@
           called to activate one or more parts of the when a webapp is
           deployed.  Must have the same value as "UseRegionBasedMarshalling".
         -->
-		  <attribute name="InactiveOnStartup">false</attribute>
+		<attribute name="InactiveOnStartup">false</attribute>
 
-        <!-- Buddy Replication config -->
+        <!-- Buddy Replication config.
+        
+             See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheBuddyReplicationDesign
+             and the JBoss Cache docs for more on buddy replication.
+             
+             By default, buddy replication is disabled.
+             
+             Following are the configuration elements likely to be changed:
+             
+             buddyReplicationEnabled  true if you want buddy replication; false if data
+                                      should be replicated to all nodes in the cluster
+                                      
+             numBuddies               to how many backup nodes should each node replicate
+                                      its state
+                                      
+             buddyPoolName            allows logical subgrouping of nodes within the cluster;
+                                      if possible, buddies will be chosen from nodes in the 
+                                      same buddy pool
+                                      
+             Do not change the data gravitation related options.             
+        -->
         <attribute name="BuddyReplicationConfig">
             <config>
                 <buddyReplicationEnabled>true</buddyReplicationEnabled>
@@ -154,23 +175,16 @@
  
         <attribute name="CacheLoaderConfiguration">
             <config>
-                <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
                 <passivation>true</passivation>
                 <preload>/</preload>
                 <shared>false</shared>
-                <!-- we can now have multiple cache loaders, which get chained -->
                 <cacheloader>
                     <class>org.jboss.cache.loader.FileCacheLoader</class>
-                    <!-- same as the old CacheLoaderConfig attribute -->
                     <properties>
                         location=/tmp
                     </properties>
-                    <!-- whether the cache loader writes are asynchronous -->
                     <async>true</async>
-                    <!-- only one cache loader in the chain may set fetchPersistentState to true.
-                        An exception is thrown if more than one cache loader sets this to true. -->
-                    <fetchPersistentState>false</fetchPersistentState>
-                    <!-- determines whether this cache loader ignores writes - defaults to false. -->
+                    <fetchPersistentState>true</fetchPersistentState>
                     <ignoreModifications>false</ignoreModifications>
                 </cacheloader>
             </config>

Modified: trunk/tomcat/src/resources/tc6-cluster-service.xml
===================================================================
--- trunk/tomcat/src/resources/tc6-cluster-service.xml	2006-08-03 19:57:32 UTC (rev 55136)
+++ trunk/tomcat/src/resources/tc6-cluster-service.xml	2006-08-03 19:59:44 UTC (rev 55137)
@@ -79,8 +79,9 @@
                       down_thread="false" up_thread="false" num_initial_members="3"/>
                 <MERGE2 max_interval="100000"
                         down_thread="false" up_thread="false" min_interval="20000"/>
-                <FD shun="true" up_thread="false" down_thread="false"
-                        timeout="2500" max_tries="5"/>
+	            <FD_SOCK down_thread="false" up_thread="false"/>
+	            <FD shun="true" up_thread="true" down_thread="true"
+	               timeout="20000" max_tries="5"/>
                 <VERIFY_SUSPECT timeout="1500"
                         up_thread="false" down_thread="false"/>
                 <pbcast.NAKACK max_xmit_size="60000"
@@ -128,9 +129,29 @@
           called to activate one or more parts of the when a webapp is
           deployed.  Must have the same value as "UseRegionBasedMarshalling".
         -->
-		  <attribute name="InactiveOnStartup">false</attribute>
+		<attribute name="InactiveOnStartup">false</attribute>
 
-        <!-- Buddy Replication config -->
+        <!-- Buddy Replication config.
+        
+             See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheBuddyReplicationDesign
+             and the JBoss Cache docs for more on buddy replication.
+             
+             By default, buddy replication is disabled.
+             
+             Following are the configuration elements likely to be changed:
+             
+             buddyReplicationEnabled  true if you want buddy replication; false if data
+                                      should be replicated to all nodes in the cluster
+                                      
+             numBuddies               to how many backup nodes should each node replicate
+                                      its state
+                                      
+             buddyPoolName            allows logical subgrouping of nodes within the cluster;
+                                      if possible, buddies will be chosen from nodes in the 
+                                      same buddy pool
+                                      
+             Do not change the data gravitation related options.             
+        -->
         <attribute name="BuddyReplicationConfig">
             <config>
                 <buddyReplicationEnabled>true</buddyReplicationEnabled>




More information about the jboss-cvs-commits mailing list