[Jboss-cvs] JBossAS SVN: r56867 - trunk/ejb3/src/resources

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-09-14 17:09:03 -0400 (Thu, 14 Sep 2006)
New Revision: 56867

Modified:
   trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
   trunk/ejb3/src/resources/ejb3-entity-cache-service.xml
Log:
[JBAS-3588] Use sys prop to config multiplexer stack
[JBAS-3592] Use sys prop to config ip_ttl

Modified: trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2006-09-14 21:05:52 UTC (rev 56866)
+++ trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2006-09-14 21:09:03 UTC (rev 56867)
@@ -8,7 +8,7 @@
             elements out and uncomment the ClusterConfig attribute below. -->
       <depends>jgroups.mux:name=Multiplexer</depends>
       <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
-      <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+      <attribute name="MultiplexerStack">${jboss.multiplexer.stack:udp}</attribute>
 
       <attribute name="ClusterName">SFSB-Cache</attribute>
       
@@ -38,7 +38,7 @@
 		     
       <attribute name="ClusterConfig">
          <config>
-            <UDP mcast_addr="${jboss.partition.udpGroup:238.1.2.3}" 
+            <UDP mcast_addr="${jgroups.udp.mcast_addr:238.1.2.3}" 
                  mcast_port="45561"
                  ucast_recv_buf_size="20000000"
                  ucast_send_buf_size="640000"
@@ -49,7 +49,7 @@
                  max_bundle_timeout="30" 
                  use_incoming_packet_handler="true" 
                  use_outgoing_packet_handler="false" 
-                 ip_ttl="2" 
+                 ip_ttl="${jgroups.udp.ip_ttl:2}" 
                  down_thread="false" up_thread="false"
                  enable_bundling="true"/>
             <PING timeout="2000"
@@ -63,19 +63,19 @@
                     up_thread="false" down_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="50" 
-                           retransmit_timeout="100,200,300,600,1200,2400,4800" 
+                           retransmit_timeout="300,600,1200,2400,4800" 
                            down_thread="false" up_thread="false"
                            discard_delivered_msgs="true"/>
             <UNICAST timeout="300,600,1200,2400,3600" 
                      down_thread="false" up_thread="false"/>
             <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" 
                            down_thread="false" up_thread="false"
-                           max_bytes="2100000"/>
+                           max_bytes="400000"/>
             <pbcast.GMS print_local_addr="true" join_timeout="3000" 
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="true"/>
-            <FC max_credits="10000000" down_thread="false" up_thread="false"
-                min_threshold="0.20"/>
+            <FC max_credits="2000000" down_thread="false" up_thread="false"
+                min_threshold="0.10"/>
             <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
         </config>

Modified: trunk/ejb3/src/resources/ejb3-entity-cache-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-entity-cache-service.xml	2006-09-14 21:05:52 UTC (rev 56866)
+++ trunk/ejb3/src/resources/ejb3-entity-cache-service.xml	2006-09-14 21:09:03 UTC (rev 56867)
@@ -14,7 +14,7 @@
             elements out and uncomment the ClusterConfig attribute below. -->
     <depends>jgroups.mux:name=Multiplexer</depends>
     <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
-    <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+    <attribute name="MultiplexerStack">${jboss.multiplexer.stack:udp}</attribute>
 
     <!-- Name of cluster. Needs to be the same for all clusters, in order
              to find each other -->
@@ -49,7 +49,7 @@
 		     
       <attribute name="ClusterConfig">
          <config>
-            <UDP mcast_addr="${jboss.partition.udpGroup:238.1.2.3}" 
+            <UDP mcast_addr="${jgroups.udp.mcast_addr:238.1.2.3}" 
                  mcast_port="44333"
                  ucast_recv_buf_size="20000000"
                  ucast_send_buf_size="640000"
@@ -60,7 +60,7 @@
                  max_bundle_timeout="30" 
                  use_incoming_packet_handler="true" 
                  use_outgoing_packet_handler="false" 
-                 ip_ttl="2" 
+                 ip_ttl="${jgroups.udp.ip_ttl:2}" 
                  down_thread="false" up_thread="false"
                  enable_bundling="true"/>
             <PING timeout="2000"
@@ -74,19 +74,19 @@
                     up_thread="false" down_thread="false"/>
             <pbcast.NAKACK max_xmit_size="60000"
                            use_mcast_xmit="false" gc_lag="50" 
-                           retransmit_timeout="100,200,300,600,1200,2400,4800" 
+                           retransmit_timeout="300,600,1200,2400,4800" 
                            down_thread="false" up_thread="false"
                            discard_delivered_msgs="true"/>
             <UNICAST timeout="300,600,1200,2400,3600" 
                      down_thread="false" up_thread="false"/>
             <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" 
                            down_thread="false" up_thread="false"
-                           max_bytes="2100000"/>
+                           max_bytes="400000"/>
             <pbcast.GMS print_local_addr="true" join_timeout="3000" 
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="true"/>
-            <FC max_credits="10000000" down_thread="false" up_thread="false"
-                min_threshold="0.20"/>
+            <FC max_credits="2000000" down_thread="false" up_thread="false"
+                min_threshold="0.10"/>
             <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
         </config>