[jboss-cvs] JBossAS SVN: r106296 - in branches/Branch_No_Multicast/testsuite: src/resources/cluster/ejb2/passexp/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 28 14:05:26 EDT 2010
Author: smarlow at redhat.com
Date: 2010-06-28 14:05:26 -0400 (Mon, 28 Jun 2010)
New Revision: 106296
Removed:
branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml
Modified:
branches/Branch_No_Multicast/testsuite/build.xml
branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
branches/Branch_No_Multicast/testsuite/src/resources/cluster/partition/jboss-beans.xml
Log:
ignore DynLoadingFromSARUnitTestCase tests, use standard stack for HAPartitionStateTransferTestCase tests
Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml 2010-06-28 02:30:16 UTC (rev 106295)
+++ branches/Branch_No_Multicast/testsuite/build.xml 2010-06-28 18:05:26 UTC (rev 106296)
@@ -1496,6 +1496,8 @@
<exclude name="org/jboss/test/cluster/multicfg/test/GlobalDiscoveryDisableTestCase.class"/>
<!-- These programatically create UDP-based channels -->
<exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/*TestCase.class"/>
+ <!-- These tests depend on DownloadServerClasses=true which is currently false -->
+ <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
</patternset>
<!-- A target that allows for conditional dependency on the compilation and
Modified: branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2010-06-28 02:30:16 UTC (rev 106295)
+++ branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2010-06-28 18:05:26 UTC (rev 106296)
@@ -18,13 +18,14 @@
</constructor>
</bean>
- <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
+ <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory
<bean name="PassExpStackInjector" class="java.lang.Object">
<install bean="JChannelFactory" method="setMultiplexerConfig">
<parameter class="java.lang.String">META-INF/passexp-stacks.xml</parameter>
<parameter>true</parameter>
</install>
</bean>
+ -->
<!--
The HAPartitionCache instance defined here is shared by JBoss cluster services that
@@ -63,7 +64,7 @@
</property>
<!-- We use the "no-bundling" stacks previously injected into our JChannelFactory -->
- <property name="multiplexerStack">passexp-${jboss.multiplexer.stack:udp}</property>
+ <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
<!-- Valid isolation levels are
SERIALIZABLE
Deleted: branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml 2010-06-28 02:30:16 UTC (rev 106295)
+++ branches/Branch_No_Multicast/testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml 2010-06-28 18:05:26 UTC (rev 106296)
@@ -1,202 +0,0 @@
-<!--
- Special stacks with message bundling disabled for tests where latency can't be tolerated.
- Author: Brian Stansberry
- Version: $Id$
--->
-<protocol_stacks>
- <stack name="passexp-udp"
- description="Default: IP multicast based stack, with flow control and message bundling">
- <config>
- <UDP
- singleton_name="passexp-udp"
- mcast_port="${jgroups.udp.mcast_port:34688}"
- mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- enable_bundling="false"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="true"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
-
-
- <stack name="passexp-tcp"
- description="TCP based stack, with flow control and message bundling. This is usually used when IP
- multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast)">
- <config>
- <TCP
- singleton_name="passexp-tcp"
- start_port="37600"
- tcp_nodelay="true"
- loopback="false"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <!-- Alternative 1: multicast-based automatic discovery. -->
- <MPING timeout="3000"
- num_initial_members="3"
- mcast_addr="${jgroups.udp.mcast_addr:230.11.11.11}"
- mcast_port="${jgroups.tcp_mping.mcast_port:34700}"
- ip_ttl="${jgroups.udp.ip_ttl:2}"/>
- <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
- of all possible cluster members.
- <TCPPING timeout="3000"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
- port_range="1"
- num_initial_members="3"/>
- -->
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="true"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
-
- <stack name="passexp-tcpgossip"
- description="TCP based stack, with flow control and message bundling. This is usually used when IP
- multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast)">
- <config>
- <TCP
- singleton_name="passexp-tcpgossip"
- start_port="37600"
- tcp_nodelay="true"
- loopback="false"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- use_concurrent_stack="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
- <TCPGOSSIP timeout="3000"
- initial_hosts="${jgroups.tcpgossip.initial_hosts:localhost[12000]}"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="true"
- view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="2000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
-
-</protocol_stacks>
-
-
Modified: branches/Branch_No_Multicast/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/resources/cluster/partition/jboss-beans.xml 2010-06-28 02:30:16 UTC (rev 106295)
+++ branches/Branch_No_Multicast/testsuite/src/resources/cluster/partition/jboss-beans.xml 2010-06-28 18:05:26 UTC (rev 106296)
@@ -1,42 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
- <bean name="PassExpStackInjector" class="java.lang.Object">
- <install bean="JChannelFactory" method="setMultiplexerConfig">
- <parameter class="java.lang.String">META-INF/passexp-stacks.xml</parameter>
- <parameter>true</parameter>
- </install>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory
+ <bean name="PassExpStackInjector" class="java.lang.Object">
+ <install bean="JChannelFactory" method="setMultiplexerConfig">
+ <parameter class="java.lang.String">META-INF/passexp-stacks.xml</parameter>
+ <parameter>true</parameter>
+ </install>
</bean>
-
+ -->
+
<!-- First we create a Configuration object for the cache -->
<bean name="HAPartitionStateTransferTestCacheConfig"
- class="org.jboss.cache.config.Configuration">
-
- <!-- When we're installed, register ourself -->
- <install bean="CacheConfigurationRegistry" method="registerConfiguration">
- <parameter>ha-partition-state-transfer</parameter>
- <parameter><this/></parameter>
- </install>
-
- <!-- When we're uninstalled, unregister ourself -->
- <uninstall bean="CacheConfigurationRegistry" method="unregisterConfiguration">
- <parameter>ha-partition-state-transfer</parameter>
- </uninstall>
-
- <!-- The ClusterPartition beans need to wait until we are completely
- installed and have register ourself -->
+ class="org.jboss.cache.config.Configuration">
+
+ <!-- When we're installed, register ourself -->
+ <install bean="CacheConfigurationRegistry" method="registerConfiguration">
+ <parameter>ha-partition-state-transfer</parameter>
+ <parameter><this/></parameter>
+ </install>
+
+ <!-- When we're uninstalled, unregister ourself -->
+ <uninstall bean="CacheConfigurationRegistry" method="unregisterConfiguration">
+ <parameter>ha-partition-state-transfer</parameter>
+ </uninstall>
+
+ <!-- The ClusterPartition beans need to wait until we are completely
+ installed and have register ourself -->
<supply>HAPartitionStateTransferTestCacheConfigSupply</supply>
<!-- Externally injected services -->
<property name="runtimeConfig">
<bean name="HAPartitionStateTransferTestCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
<property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
- </bean>
- </property>
-
- <property name="multiplexerStack">passexp-${jboss.default.jgroups.stack:udp}</property>
+ </bean>
+ </property>
+
+ <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
<!-- Valid isolation levels are
SERIALIZABLE
@@ -71,15 +72,15 @@
<property name="exposeManagementStatistics">true</property>
- </bean>
+ </bean>
- <bean name="HAPartitionStateTransferTestCacheHandler"
- class="org.jboss.ha.framework.server.HAPartitionCacheHandlerImpl">
- <property name="cacheManager"><inject bean="CacheManager"/></property>
- <property name="cacheConfigName">ha-partition-state-transfer</property>
- </bean>
-
+ <bean name="HAPartitionStateTransferTestCacheHandler"
+ class="org.jboss.ha.framework.server.HAPartitionCacheHandlerImpl">
+ <property name="cacheManager"><inject bean="CacheManager"/></property>
+ <property name="cacheConfigName">ha-partition-state-transfer</property>
+ </bean>
+
<!-- ==================================================================== -->
<!-- Partition used for testing failure to receive state -->
<!-- ==================================================================== -->
@@ -92,10 +93,10 @@
<bean name="BadProviderPartition"
class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
-
+
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
-
- <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
+
+ <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
<!-- ClusterPartition requires a Cache for state management -->
<property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
@@ -148,11 +149,11 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
- <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
-
- <!-- ClusterPartition requires a Cache for state management -->
- <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
-
+ <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
+
+ <!-- ClusterPartition requires a Cache for state management -->
+ <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
+
<!-- Name of the partition being built -->
<property name="partitionName">BadStatePartition</property>
@@ -201,11 +202,11 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
- <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
-
- <!-- ClusterPartition requires a Cache for state management -->
- <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
-
+ <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
+
+ <!-- ClusterPartition requires a Cache for state management -->
+ <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
+
<!-- Name of the partition being built -->
<property name="partitionName">NoStatePartition</property>
@@ -237,11 +238,11 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
- <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
-
- <!-- ClusterPartition requires a Cache for state management -->
- <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
-
+ <demand>HAPartitionStateTransferTestCacheConfigSupply</demand>
+
+ <!-- ClusterPartition requires a Cache for state management -->
+ <property name="cacheHandler"><inject bean="HAPartitionStateTransferTestCacheHandler"/></property>
+
<!-- Name of the partition being built -->
<property name="partitionName">GoodStatePartition</property>
More information about the jboss-cvs-commits
mailing list