[jboss-cvs] JBossAS SVN: r109994 - trunk/cluster/src/resources/infinispan.

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

Author: pferraro
Date: 2010-12-17 12:18:05 -0500 (Fri, 17 Dec 2010)
New Revision: 109994

Modified:
   trunk/cluster/src/resources/infinispan/infinispan-configs.xml
Log:
Fix clustering testsuite regressions.
Disable ISPN-835 workaround for replicated-query and timestamp caches - this is dependent on HHH-5793.

Modified: trunk/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-12-17 17:12:07 UTC (rev 109993)
+++ trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-12-17 17:18:05 UTC (rev 109994)
@@ -24,16 +24,9 @@
         <invocationBatching enabled="true"/>
         <clustering mode="replication">
           <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
-          <!--stateRetrieval timeout="60000" fetchInMemoryState="true"/-->
+          <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
           <sync replTimeout="17500"/>
         </clustering>
-        <loaders>
-          <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
-            <properties>
-              <property name="remoteCallTimeout" value="60000"/>
-            </properties>
-          </loader>
-        </loaders>
       </default>
     </infinispan>
   </infinispan-config>
@@ -67,11 +60,7 @@
               <property name="location" value="${jboss.server.data.dir}${/}web"/>
             </properties>
           </loader>
-          <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
-            <properties>
-              <property name="remoteCallTimeout" value="60000"/>
-            </properties>
-          </loader>
+          <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader"/>
         </loaders>
       </default>
       <namedCache name="sync">
@@ -92,6 +81,7 @@
           <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
           <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
           <hash numOwners="2"/>
+          <async useReplQueue="false"/>
         </clustering>
         <loaders passivation="true">
           <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false" purgeOnStartup="true">
@@ -166,6 +156,7 @@
           <!--stateRetrieval timeout="60000" fetchInMemoryState="false"/-->
           <hash numOwners="2"/>
           <l1 enabled="true"/>
+          <async useReplQueue="false"/>
         </clustering>
         <loaders passivation="true">
           <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false" purgeOnStartup="true">
@@ -265,8 +256,7 @@
       <!-- A query cache that replicates queries.  Replication is asynchronous. -->
       <namedCache name="replicated-query">
         <clustering mode="replication">
-          <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
-          <!--stateRetrieval fetchInMemoryState="false"/-->
+          <stateRetrieval fetchInMemoryState="false"/>
           <async/>
         </clustering>
         <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -276,21 +266,13 @@
         <eviction wakeUpInterval="5000" maxEntries="10000" strategy="LRU"/>
         <expiration maxIdle="100000"/>
         <lazyDeserialization enabled="true"/>
-        <loaders>
-          <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader">
-            <properties>
-              <property name="remoteCallTimeout" 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">
-          <!-- ISPN-835 workaround, use cluster cache loader in place of state transfer -->
-          <!--stateRetrieval fetchInMemoryState="true" timeout="20000"/-->
+          <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
           <async/>
         </clustering>
         <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -298,13 +280,6 @@
         <!--  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="remoteCallTimeout" value="20000"/>
-            </properties>
-          </loader>
-        </loaders>
       </namedCache>
     </infinispan>
   </infinispan-config>