[jboss-cvs] JBossAS SVN: r60111 - branches/Branch_4_2/cluster/src/resources/jgroups.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 30 00:54:57 EST 2007


Author: bstansberry at jboss.com
Date: 2007-01-30 00:54:56 -0500 (Tue, 30 Jan 2007)
New Revision: 60111

Modified:
   branches/Branch_4_2/cluster/src/resources/jgroups/multiplexer-stacks.xml
Log:
Match up with stacks.xml; remove STREAMING_STATE_TRANSFER and FLUSH

Modified: branches/Branch_4_2/cluster/src/resources/jgroups/multiplexer-stacks.xml
===================================================================
--- branches/Branch_4_2/cluster/src/resources/jgroups/multiplexer-stacks.xml	2007-01-30 05:52:14 UTC (rev 60110)
+++ branches/Branch_4_2/cluster/src/resources/jgroups/multiplexer-stacks.xml	2007-01-30 05:54:56 UTC (rev 60111)
@@ -45,16 +45,12 @@
           <pbcast.GMS print_local_addr="true" join_timeout="3000"
                    down_thread="false" up_thread="false"
                    join_retry_timeout="2000" shun="true"
-                   view_bundling="true"/>
+                   view_bundling="true"
+                   view_ack_collection_timeout="5000"/>
           <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.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                   use_flush="true" use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-          <!-- TODO re-enable FLUSH
-          <pbcast.FLUSH down_thread="false" up_thread="false"/>
-          -->
         </config>
     </stack>
     
@@ -104,12 +100,7 @@
                     join_retry_timeout="2000" shun="true"
                     view_bundling="true"/>
             <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-            <!--pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                    use_flush="true" use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <!-- TODO re-enable FLUSH
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-            -->
         </config>
     </stack>
 
@@ -157,12 +148,7 @@
             <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.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                      use_flush="true" use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <!-- TODO re-enable FLUSH
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-            -->
         </config>
     </stack>
 
@@ -209,12 +195,7 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="true"
                         view_bundling="true"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                         use_flush="true" use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <!-- TODO re-enable FLUSH
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-            -->
         </config>
     </stack>
 
@@ -245,10 +226,10 @@
                    processor_queueSize="100"
                    processor_keepAliveTime="-1"/>
             <TCPPING timeout="3000"
+                     down_thread="false" up_thread="false"
                      initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7700],localhost[7701]}"
                      port_range="1"
-                     num_initial_members="3"
-                     down_thread="false" up_thread="false"/>
+                     num_initial_members="3"/>
             <MERGE2 max_interval="100000"
                   down_thread="false" up_thread="false" min_interval="20000"/>
             <FD_SOCK down_thread="false" up_thread="false"/>
@@ -269,12 +250,7 @@
             <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.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                   use_flush="true" use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <!-- TODO re-enable FLUSH
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-            -->
         </config>
     </stack>
 
@@ -307,10 +283,10 @@
                      processor_queueSize="100"
                      processor_keepAliveTime="-1"/>
             <TCPPING timeout="3000"
+                     down_thread="false" up_thread="false"
                      initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7750],localhost[7751]}"
                      port_range="1"
-                     num_initial_members="3"
-                     down_thread="false" up_thread="false"/>
+                     num_initial_members="3"/>
             <MERGE2 max_interval="100000"
                     down_thread="false" up_thread="false" min_interval="20000"/>
             <FD_SOCK down_thread="false" up_thread="false"/>
@@ -328,15 +304,47 @@
                         down_thread="false" up_thread="false"
                         join_retry_timeout="2000" shun="true"
                         view_bundling="true"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                        use_flush="true" use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <!-- TODO re-enable FLUSH
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-            -->
         </config>
     </stack>
 
+
+    <stack name="tunnel"
+           description="Used with a GossipRouter">
+        <config>
+            <TUNNEL router_port="12001" router_host="127.0.0.1"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"
+                  gossip_refresh="10000"
+                  gossip_host="127.0.0.1"
+                  gossip_port="12001"/>
+            <MERGE2 max_interval="20000"
+                    down_thread="false" up_thread="false" min_interval="5000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="2000" max_tries="3" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           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="5000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="false"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <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>
+    </stack>
+
 </protocol_stacks>
 
 




More information about the jboss-cvs-commits mailing list