[jboss-cvs] JBossAS SVN: r109947 - in trunk: testsuite/imports and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 15 16:02:09 EST 2010
Author: pferraro
Date: 2010-12-15 16:02:09 -0500 (Wed, 15 Dec 2010)
New Revision: 109947
Modified:
trunk/cluster/src/resources/infinispan/infinispan-configs.xml
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/server-config.xml
Log:
Workaround for ISPN-835.
Modified: trunk/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- trunk/cluster/src/resources/infinispan/infinispan-configs.xml 2010-12-15 20:45:56 UTC (rev 109946)
+++ trunk/cluster/src/resources/infinispan/infinispan-configs.xml 2010-12-15 21:02:09 UTC (rev 109947)
@@ -23,9 +23,17 @@
<lazyDeserialization enabled="false"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync replTimeout="17500"/>
</clustering>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
+ </loaders>
</default>
</infinispan>
</infinispan-config>
@@ -49,7 +57,8 @@
<lazyDeserialization enabled="true"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<async useReplQueue="false"/>
</clustering>
<loaders passivation="true">
@@ -58,18 +67,24 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</default>
<namedCache name="sync">
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync/>
</clustering>
</namedCache>
<namedCache name="dist">
<clustering mode="distribution">
- <stateRetrieval timeout="60000" fetchInMemoryState="false"/>
- <sync/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
<hash numOwners="2"/>
</clustering>
<loaders passivation="true">
@@ -78,6 +93,11 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</namedCache>
</infinispan>
@@ -103,7 +123,8 @@
<lazyDeserialization enabled="true"/>
<invocationBatching enabled="true"/>
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<async useReplQueue="false"/>
</clustering>
<loaders passivation="true" shared="false">
@@ -112,19 +133,24 @@
<property name="location" value="${jboss.server.data.dir}${/}sfsb"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
<eviction wakeUpInterval="5000" strategy="LRU"/>
</default>
<namedCache name="sync">
<clustering mode="replication">
- <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
+ <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
<sync/>
</clustering>
</namedCache>
<namedCache name="dist">
<clustering mode="distribution">
- <stateRetrieval timeout="60000" fetchInMemoryState="false"/>
- <sync/>
+ <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
<hash numOwners="2"/>
<l1 enabled="true"/>
</clustering>
@@ -134,6 +160,11 @@
<property name="location" value="${jboss.server.data.dir}${/}web"/>
</properties>
</loader>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="60000"/>
+ </properties>
+ </loader>
</loaders>
</namedCache>
</infinispan>
@@ -221,7 +252,7 @@
<!-- A query cache that replicates queries. Replication is asynchronous. -->
<namedCache name="replicated-query">
<clustering mode="replication">
- <stateRetrieval fetchInMemoryState="false"/>
+ <!--stateRetrieval fetchInMemoryState="false"/-->
<async/>
</clustering>
<locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -231,13 +262,20 @@
<eviction wakeUpInterval="5000" maxEntries="10000" strategy="LRU"/>
<expiration maxIdle="100000"/>
<lazyDeserialization enabled="true"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="10000"/>
+ </properties>
+ </loader>
+ </loaders>
</namedCache>
<!-- Optimized for timestamp caching. -->
<!-- A clustered timestamp cache is required if query caching is used, even if the query cache itself is configured with CacheMode=LOCAL. -->
<namedCache name="timestamps">
<clustering mode="replication">
- <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
+ <!--stateRetrieval fetchInMemoryState="true" timeout="20000"/-->
<async/>
</clustering>
<locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -245,6 +283,13 @@
<!-- Don't ever evict modification timestamps -->
<eviction wakeUpInterval="0" strategy="NONE"/>
<lazyDeserialization enabled="true"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
+ <properties>
+ <property name="timeout" value="20000"/>
+ </properties>
+ </loader>
+ </loaders>
</namedCache>
</infinispan>
</infinispan-config>
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2010-12-15 20:45:56 UTC (rev 109946)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2010-12-15 21:02:09 UTC (rev 109947)
@@ -209,7 +209,7 @@
<sleep seconds="4"/>
- <echo message="Going to call target tests-clustering-unit again with new configuration (DIST_SYNC)"/>
+ <echo message="Going to call target tests-clustering-unit again with new configuration (DIST_ASYNC)"/>
<antcall target="tests-clustering-dist-configure" inheritRefs="true"/>
@@ -537,7 +537,7 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs the EJB3 tests (DIST_SYNC) -->
+ <!-- Runs the EJB3 tests (DIST_ASYNC) -->
<target name="tests-clustering-ejb3-dist" depends="init">
<property name="jboss-junit-configuration" value="udp"/>
@@ -629,7 +629,7 @@
<server:stop name="cluster-${jboss-junit-configuration}-1"/>
</target>
- <!-- Runs only the basic http tests (DIST_SYNC) -->
+ <!-- Runs only the basic http tests (DIST_ASYNC) -->
<target name="tests-clustering-http-dist" depends="init">
<property name="jboss-junit-configuration" value="udp"/>
@@ -659,4 +659,34 @@
<server:stop name="cluster-${jboss-junit-configuration}-DIST-1"/>
</target>
+ <!-- Runs only the basic http tests (REPL_SYNC) -->
+ <target name="tests-clustering-http-sync" depends="init">
+
+ <property name="jboss-junit-configuration" value="udp"/>
+
+ <antcall target="tests-clustering-sync-configure" inheritRefs="true"/>
+
+ <server:start name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.jk.includes"/>
+ <param name="jboss-junit-configuration" value="SYNC-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
+ <param name="jboss-junit-configuration" value="SYNC-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </antcall>
+
+ <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </target>
+
</project>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2010-12-15 20:45:56 UTC (rev 109946)
+++ trunk/testsuite/imports/server-config.xml 2010-12-15 21:02:09 UTC (rev 109947)
@@ -419,7 +419,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
</server>
@@ -433,7 +433,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="udp" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
<sysproperty key="node0.bind.address" value="${node0}" />
</server>
@@ -528,7 +528,7 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</server>
@@ -541,7 +541,7 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+ <sysproperty key="jboss.multiplexer.stack" value="tcp" />
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
More information about the jboss-cvs-commits
mailing list