[jboss-cvs] JBossAS SVN: r109388 - in trunk: testsuite/src/resources/cluster/channelfactory and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Nov 19 05:15:08 EST 2010


Author: smarlow at redhat.com
Date: 2010-11-19 05:15:08 -0500 (Fri, 19 Nov 2010)
New Revision: 109388

Modified:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
   trunk/testsuite/src/resources/cluster/channelfactory/stacks.xml
   trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml
Log:
JBAS-8487 use UFC/MFC for flow control and use JGroups default min_threshold

Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2010-11-19 08:49:04 UTC (rev 109387)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2010-11-19 10:15:08 UTC (rev 109388)
@@ -72,8 +72,8 @@
                    view_bundling="true"                   
                    view_ack_collection_timeout="5000"
                    resume_task_timeout="7500"/>
-          <FC max_credits="2000000" min_threshold="0.10" 
-              ignore_synchronous_response="true"/>
+          <UFC max_credits="2000000" ignore_synchronous_response="true"/>
+          <MFC max_credits="2000000" ignore_synchronous_response="true"/>
           <FRAG2 frag_size="60000"/>
           <pbcast.STREAMING_STATE_TRANSFER/>
           <!--pbcast.STATE_TRANSFER/-->
@@ -142,8 +142,8 @@
                    view_bundling="true"
                    view_ack_collection_timeout="5000"
                    resume_task_timeout="7500"/>
-          <FC max_credits="2000000" min_threshold="0.10" 
-              ignore_synchronous_response="true"/>
+          <UFC max_credits="2000000" ignore_synchronous_response="true"/>
+          <MFC max_credits="2000000" ignore_synchronous_response="true"/>
           <FRAG2 frag_size="60000"/>
           <pbcast.STREAMING_STATE_TRANSFER/>
           <!--pbcast.STATE_TRANSFER/-->
@@ -286,8 +286,8 @@
                         view_bundling="true"
                         view_ack_collection_timeout="5000"
                         resume_task_timeout="7500"/>
-            <FC max_credits="2000000" min_threshold="0.10" 
-                ignore_synchronous_response="true"/>
+            <UFC max_credits="2000000" ignore_synchronous_response="true"/>
+            <MFC max_credits="2000000" ignore_synchronous_response="true"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STREAMING_STATE_TRANSFER/>
             <!--pbcast.STATE_TRANSFER/-->

Modified: trunk/testsuite/src/resources/cluster/channelfactory/stacks.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/channelfactory/stacks.xml	2010-11-19 08:49:04 UTC (rev 109387)
+++ trunk/testsuite/src/resources/cluster/channelfactory/stacks.xml	2010-11-19 10:15:08 UTC (rev 109388)
@@ -56,7 +56,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -116,7 +117,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -175,7 +177,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -234,7 +237,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -284,7 +288,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -332,7 +337,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -391,7 +397,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>

Modified: trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml	2010-11-19 08:49:04 UTC (rev 109387)
+++ trunk/testsuite/src/resources/cluster/drm/drm-test-stacks.xml	2010-11-19 10:15:08 UTC (rev 109388)
@@ -27,7 +27,8 @@
                         shun="false"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STATE_TRANSFER/>
             <pbcast.FLUSH timeout="0"/>
@@ -57,7 +58,8 @@
                         shun="false"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STATE_TRANSFER/>
             <pbcast.FLUSH timeout="0"/>

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml	2010-11-19 08:49:04 UTC (rev 109387)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml	2010-11-19 10:15:08 UTC (rev 109388)
@@ -56,7 +56,9 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
+
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -128,7 +130,8 @@
                         shun="true"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER/>



More information about the jboss-cvs-commits mailing list