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

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

Author: pferraro
Date: 2010-11-10 14:56:31 -0500 (Wed, 10 Nov 2010)
New Revision: 109245

Modified:
   trunk/cluster/src/resources/infinispan/infinispan-configs.xml
Log:
Disable shutdown hooks (they are unnecessary and can cause classloader leaks)
Enable fetchPersistentState for cache loaders - must be disabled for DIST mode variants.
Shorten clusterNames.

Modified: trunk/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-10 19:50:50 UTC (rev 109244)
+++ trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-10 19:56:31 UTC (rev 109245)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Refer to Infinispan configuration documentation http://docs.jboss.org/infinispan/4.1/apidocs/config.html for a description of the possible settings.
+  Refer to Infinispan configuration documentation http://docs.jboss.org/infinispan/4.2/apidocs/config.html for a description of the possible settings.
 -->
 <infinispan-configs default="ha-partition" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
@@ -9,12 +9,13 @@
     <alias>clustered-sso</alias>
     <infinispan xmlns="urn:infinispan:config:4.2">
       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-HAPartitionCache" distributedSyncTimeout="17500">
+        <transport clusterName="${jboss.partition.name:DefaultPartition}-HAPartition" distributedSyncTimeout="17500">
           <properties>
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
         <globalJmxStatistics enabled="true"/>
+        <shutdown hookBehavior="DONT_REGISTER"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -34,12 +35,13 @@
     <alias>standard-session-cache</alias>
     <infinispan xmlns="urn:infinispan:config:4.2">
       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-WebSessionCache" distributedSyncTimeout="17500">
+        <transport clusterName="${jboss.partition.name:DefaultPartition}-Web" distributedSyncTimeout="17500">
           <properties>
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
         <globalJmxStatistics enabled="true"/>
+        <shutdown hookBehavior="DONT_REGISTER"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -50,8 +52,8 @@
           <stateRetrieval timeout="60000" fetchInMemoryState="true"/>
           <async useReplQueue="false"/>
         </clustering>
-        <loaders passivation="true" shared="false">
-          <loader class="org.infinispan.loaders.file.FileCacheStore">
+        <loaders passivation="true">
+          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true" purgeOnStartup="true">
             <properties>
               <property name="location" value="${jboss.server.data.dir}${/}web"/>
             </properties>
@@ -70,6 +72,13 @@
           <sync/>
           <hash numOwners="2"/>
         </clustering>
+        <loaders passivation="true">
+          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false">
+            <properties>
+              <property name="location" value="${jboss.server.data.dir}${/}web"/>
+            </properties>
+          </loader>
+        </loaders>
       </namedCache>
     </infinispan>
   </infinispan-config>
@@ -80,12 +89,13 @@
     <alias>jboss.cache:service=EJB3SFSBClusteredCache</alias>
     <infinispan xmlns="urn:infinispan:config:4.2">
       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-SFSBCache" distributedSyncTimeout="17500">
+        <transport clusterName="${jboss.partition.name:DefaultPartition}-SFSB" distributedSyncTimeout="17500">
           <properties>
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
         <globalJmxStatistics enabled="true"/>
+        <shutdown hookBehavior="DONT_REGISTER"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -97,7 +107,7 @@
           <async useReplQueue="false"/>
         </clustering>
         <loaders passivation="true" shared="false">
-          <loader class="org.infinispan.loaders.file.FileCacheStore" purgeOnStartup="true">
+          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true" purgeOnStartup="true">
             <properties>
               <property name="location" value="${jboss.server.data.dir}${/}sfsb"/>
             </properties>
@@ -118,6 +128,13 @@
           <hash numOwners="2"/>
           <l1 enabled="true"/>
         </clustering>
+        <loaders passivation="true">
+          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false" purgeOnStartup="true">
+            <properties>
+              <property name="location" value="${jboss.server.data.dir}${/}web"/>
+            </properties>
+          </loader>
+        </loaders>
       </namedCache>
     </infinispan>
   </infinispan-config>
@@ -126,12 +143,13 @@
   <infinispan-config name="hibernate" jndi-name="java:CacheManager/entity">
     <infinispan xmlns="urn:infinispan:config:4.2" xsi:schemaLocation="urn:infinispan:config:4.1 http://www.infinispan.org/schemas/infinispan-config-4.1.xsd">
       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-Hibernate2ndLevelCache" distributedSyncTimeout="17500">
+        <transport clusterName="${jboss.partition.name:DefaultPartition}-Hibernate" distributedSyncTimeout="17500">
           <properties>
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
         <globalJmxStatistics enabled="true"/>
+        <shutdown hookBehavior="DONT_REGISTER"/>
       </global>
       <default>
         <!-- Used to register JMX statistics in any available MBean server -->