[jboss-cvs] JBossAS SVN: r108989 - in branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs: datagrid-1/deploy/datagrid.sar/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 29 11:30:33 EDT 2010
Author: rachmatowicz at jboss.com
Date: 2010-10-29 11:30:32 -0400 (Fri, 29 Oct 2010)
New Revision: 108989
Removed:
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml
Modified:
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
Log:
Update test-configs with new Infinispan config file.
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-29 15:29:24 UTC (rev 108988)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-29 15:30:32 UTC (rev 108989)
@@ -1,224 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
- xmlns="urn:infinispan:config:4.0">
+ xsi:schemaLocation="urn:infinispan:config:4.2 http://www.infinispan.org/schemas/infinispan-config-4.2.xsd"
+ xmlns="urn:infinispan:config:4.2">
- <!-- *************************** -->
- <!-- System-wide global settings -->
- <!-- *************************** -->
+ <!-- Detailed configuration information can be found in http://docs.jboss.org/infinispan/4.2/apidocs -->
<global>
- <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
- <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="5"/>
- <property name="threadNamePrefix" value="AsyncListenerThread"/>
- </properties>
- </asyncListenerExecutor>
+ <!--
+ Expose global, cache manager level, statistics
+ -->
+ <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
- <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <transport clusterName="${jboss.infinispan.partition.name:DatagridPartition}-Infinispan">
<properties>
- <property name="maxThreads" value="25"/>
- <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ <property name="configurationFile"
+ value="${jboss.infinispan.jgroups.config:jgroups-datagrid-udp.xml}"
+ />
</properties>
- </asyncTransportExecutor>
+ </transport>
- <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="EvictionThread"/>
- </properties>
- </evictionScheduledExecutor>
+ <!--
+ Executor settings for when asynchronous replication with replication queue is used
- <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultSharedScheduledExecutorFactory">
<properties>
- <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ <property name="maxThreads"
+ value="1"
+ />
+ <property name="threadNamePrefix"
+ value="replicationQueue-thread"
+ />
</properties>
</replicationQueueScheduledExecutor>
+ -->
- <globalJmxStatistics enabled="true" jmxDomain="infinispan"/>
-
<!--
- If the transport is omitted, there is no way to create distributed or clustered caches.
- There is no added cost to defining a transport but not creating a cache that uses one, since the transport
- is created and initialized lazily.
+ Executor settings for when asynchronous marshalling has been enabled
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultSharedExecutorFactory">
+ <properties>
+ <property name="maxThreads"
+ value="25"
+ />
+ <property name="threadNamePrefix"
+ value="transport-thread"
+ />
+ </properties>
+ </asyncTransportExecutor>
-->
- <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno">
- <!-- Comment this specification out until it is fixed.
- <properties>
- <property name="configurationFile" value="jgroups-udp.xml"/>
- </properties>
- -->
- </transport>
-
- <!-- Again, sensible defaults are used here if this is omitted. -->
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
-
<!--
- Used to register JVM shutdown hooks.
- hookBehavior: DEFAULT, REGISTER, DONT_REGISTER
+ Executor settings for eviction has been configured in the cache
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultSharedScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix"
+ value="eviction-thread"
+ />
+ </properties>
+ </evictionScheduledExecutor>
-->
- <shutdown hookBehavior="DEFAULT"/>
+
</global>
- <!-- *************************** -->
- <!-- Default "template" settings -->
- <!-- *************************** -->
- <!-- this is used as a "template" configuration for all caches in the system. -->
+ <!--
+ Default cache configuration. Memcached clients can only interact against this cache.
+ Hot Rod and REST clients can interact against the default or one of the named caches.
+ -->
<default>
- <!--
- isolation levels supported: READ_COMMITTED and REPEATABLE_READ
- -->
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500"
- useLockStriping="true"
- />
<!--
- Used to register a transaction manager and participate in ongoing transactions.
+ READ_COMMITTED is the only relevant isolation level for the data grid
+ Adjust concurrency level according to number of concurrent threads interacting with the cache
-->
- <transaction
- transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
- syncRollbackPhase="false"
- syncCommitPhase="false"
- useEagerLocking="false"/>
+ <locking isolationLevel="READ_COMMITTED"
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="500"
+ useLockStriping="false"
+ />
<!--
- Used to register JMX statistics in any available MBean server
+ Expose cache level statistics
-->
<jmxStatistics enabled="false"/>
- <lazyDeserialization enabled="false"/>
-
<!--
- Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
+ This element specifies that the cache is clustered.
+ modes supported: distribution (d), replication (r) or invalidation (i).
-->
- <invocationBatching enabled="false"/>
+ <clustering mode="distribution">
- <!--
- This element specifies that the cache is clustered.
- modes supported: distribution (d), replication (r) or invalidation (i).
- -->
- <clustering mode="replication">
-
<!--
- Defines whether to retrieve state on startup
+ Network calls are synchronous.
-->
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <sync replTimeout="20000"/>
<!--
- Network calls are synchronous.
+ numOwners: number of owners for each key. The larger this number is, the safer your data will be, but the
+ slower the cluster will be.
+
+ rehashRpcTimeout: timeout used for RPC calls relating to rehashing. This defaults to 600000 (10 minutes).
-->
- <sync replTimeout="20000"/>
+ <hash numOwners="2" rehashWait="120000" rehashRpcTimeout="600000"/>
+
<!--
- Uncomment this for async replication.
+ L1 cache enables more efficient reads in those nodes that don't own the data
+ The lifespan, defined in milliseconds, indicates how long data should live in L1
-->
- <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500"/>-->
- </clustering>
+ <l1 enabled="true"
+ lifespan="600000"
+ />
- </default>
-
- <!-- ************************************** -->
- <!-- Individually configured "named" caches -->
- <!-- ************************************** -->
-
- <namedCache name="asyncCache">
- <clustering mode="replication">
- <async asyncMarshalling="true"/>
</clustering>
- </namedCache>
- <!-- Note that any of the elements appearing in a namedCache section can also appear in the default section as a template. -->
- <namedCache name="evictionCache">
-
<!--
- Eviction configuration. WakeupInterval defines how often the eviction thread runs, in milliseconds. 0 means
- the eviction thread will never run. A separate executor is used for eviction in each cache.
+ Eviction configuration.
+
+ WakeupInterval defines how often the eviction thread runs, in milliseconds.
+ 0 means the eviction thread will never run.
-->
- <eviction wakeUpInterval="500" maxEntries="5000" strategy="FIFO" threadPolicy="PIGGYBACK"/>
- <expiration lifespan="60000" maxIdle="1000"/>
- </namedCache>
+ <eviction wakeUpInterval="500"
+ maxEntries="5000"
+ strategy="LIRS"
+ />
-
- <namedCache name="persistentCache">
<!--
- Cache loaders.
+ Expiration configuration allows you to limit how long each cache entry should live for.
- If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
- is accessed again, it is removed from the cache loaderold and loaded into memory.
+ <expiration lifespan="60000"
+ maxIdle="1000"
+ />
+ -->
- Otherwise, state is always maintained in the cache loaderold as well as in memory.
+ </default>
- Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the
- same database.
+ <namedCache name="sampleReplicatedCache">
- If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache.
- -->
- <loaders passivation="false" shared="false" preload="true">
+ <clustering mode="replication">
<!--
- We can have multiple cache loaders, which get chained
+ Defines whether to retrieve state on startup
-->
- <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true"
- ignoreModifications="true" purgeOnStartup="true">
+ <stateRetrieval timeout="20000"
+ fetchInMemoryState="false"
+ alwaysProvideInMemoryState="false"
+ />
- <!-- See the documentation for more configuration examples and flags. -->
- <properties>
- <property name="location" value="${java.io.tmpdir}"/>
- </properties>
- <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
- <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/>
- </loader>
- </loaders>
-
- <deadlockDetection enabled="true" spinDuration="1000"/>
-
- </namedCache>
-
- <namedCache name="distributedCache">
- <clustering mode="distribution">
- <sync/>
<!--
- num owners: number of owners for each key. The larger this number is, the safer your data will be, but the
- slower the cluster will be.
-
- rehashRpcTimeout: timeout used for RPC calls relating to rehashing. This defaults to 600000 (10 minutes).
+ Asynchronous replication with a replication queue that is flushed every replQueueInterval milliseconds
+ or when the replication queue has exceeded certain size.
-->
- <hash numOwners="3" rehashWait="120000" rehashRpcTimeout="600000"/>
- <l1 enabled="true" lifespan="600000"/>
- </clustering>
- </namedCache>
+ <async useReplQueue="true"
+ replQueueInterval="10000"
+ replQueueMaxElements="500"
+ asyncMarshalling="false"
+ />
- <namedCache name="withReplicatinQueue">
- <clustering>
- <async useReplQueue="true" replQueueInterval="100" replQueueMaxElements="200"/>
</clustering>
- </namedCache>
- <namedCache name="lockPerEntry">
- <locking useLockStriping="false" />
</namedCache>
- <namedCache name="cacheWithCustomInterceptors">
+ <namedCache name="samplePersistedCache">
+
<!--
- Define custom interceptors. All custom interceptors need to extend org.jboss.cache.interceptors.base.CommandInterceptor
+ Cache loaders.
+
+ If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
+ is accessed again, it is removed from the cache loaderold and loaded into memory.
+
+ Otherwise, state is always maintained in the cache loaderold as well as in memory.
+
+ Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the
+ same database.
+
+ If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache.
+
+ We can have multiple cache loaders, which get chained
-->
- <!--
- <customInterceptors>
- <interceptor position="first" class="com.mycompany.CustomInterceptor1">
- <property name="com.mycompany.attributeOne" value="value1" />
- <property name="com.mycompany.attributeTwo" value="value2" />
- </interceptor>
- <interceptor position="last" class="com.mycompany.CustomInterceptor2"/>
- <interceptor index="3" class="com.mycompany.CustomInterceptor1"/>
- <interceptor before="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor2"/>
- <interceptor after="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor1"/>
- </customInterceptors>
- -->
+
+ <loaders passivation="false"
+ shared="false"
+ preload="true">
+
+ <loader class="org.infinispan.loaders.file.FileCacheStore"
+ fetchPersistentState="false"
+ ignoreModifications="false"
+ purgeOnStartup="false">
+
+ <properties>
+ <property name="location"
+ value="${java.io.tmpdir}"
+ />
+ </properties>
+
+ <async enabled="false" />
+ </loader>
+ </loaders>
+
</namedCache>
-</infinispan>
+
+</infinispan>
\ No newline at end of file
Deleted: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-29 15:29:24 UTC (rev 108988)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-29 15:30:32 UTC (rev 108989)
@@ -1,58 +0,0 @@
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <UDP
- mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
- mcast_port="${jgroups.udp.mcast_port:46655}"
- bind_port="${jboss.jgroups.udp.bind_port:55200}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- enable_bundling="true"
- enable_diagnostics="false"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="30"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="Discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="30"
- 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="Discard"
- />
-
- <PING timeout="3000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK start_port="${jboss.jgroups.udp.fd_sock_port:54200}"/>
- <FD_ALL/>
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="0"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
- <FC max_credits="500000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
-</config>
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-29 15:29:24 UTC (rev 108988)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-29 15:30:32 UTC (rev 108989)
@@ -1,223 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
- xmlns="urn:infinispan:config:4.0">
+ xsi:schemaLocation="urn:infinispan:config:4.2 http://www.infinispan.org/schemas/infinispan-config-4.2.xsd"
+ xmlns="urn:infinispan:config:4.2">
- <!-- *************************** -->
- <!-- System-wide global settings -->
- <!-- *************************** -->
+ <!-- Detailed configuration information can be found in http://docs.jboss.org/infinispan/4.2/apidocs -->
<global>
- <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
- <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="5"/>
- <property name="threadNamePrefix" value="AsyncListenerThread"/>
- </properties>
- </asyncListenerExecutor>
+ <!--
+ Expose global, cache manager level, statistics
+ -->
+ <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
- <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <transport clusterName="${jboss.infinispan.partition.name:DatagridPartition}-Infinispan">
<properties>
- <property name="maxThreads" value="25"/>
- <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ <property name="configurationFile"
+ value="${jboss.infinispan.jgroups.config:jgroups-datagrid-udp.xml}"
+ />
</properties>
- </asyncTransportExecutor>
+ </transport>
- <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="EvictionThread"/>
- </properties>
- </evictionScheduledExecutor>
+ <!--
+ Executor settings for when asynchronous replication with replication queue is used
- <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultSharedScheduledExecutorFactory">
<properties>
- <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ <property name="maxThreads"
+ value="1"
+ />
+ <property name="threadNamePrefix"
+ value="replicationQueue-thread"
+ />
</properties>
</replicationQueueScheduledExecutor>
+ -->
- <globalJmxStatistics enabled="true" jmxDomain="infinispan"/>
-
<!--
- If the transport is omitted, there is no way to create distributed or clustered caches.
- There is no added cost to defining a transport but not creating a cache that uses one, since the transport
- is created and initialized lazily.
+ Executor settings for when asynchronous marshalling has been enabled
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultSharedExecutorFactory">
+ <properties>
+ <property name="maxThreads"
+ value="25"
+ />
+ <property name="threadNamePrefix"
+ value="transport-thread"
+ />
+ </properties>
+ </asyncTransportExecutor>
-->
- <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno">
- <!-- Connet this specification out until it is fixed
- <properties>
- <property name="configurationFile" value="jgroups-udp.xml"/>
- </properties>
- -->
- </transport>
- <!-- Again, sensible defaults are used here if this is omitted. -->
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
-
<!--
- Used to register JVM shutdown hooks.
- hookBehavior: DEFAULT, REGISTER, DONT_REGISTER
+ Executor settings for eviction has been configured in the cache
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultSharedScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix"
+ value="eviction-thread"
+ />
+ </properties>
+ </evictionScheduledExecutor>
-->
- <shutdown hookBehavior="DEFAULT"/>
+
</global>
- <!-- *************************** -->
- <!-- Default "template" settings -->
- <!-- *************************** -->
- <!-- this is used as a "template" configuration for all caches in the system. -->
+ <!--
+ Default cache configuration. Memcached clients can only interact against this cache.
+ Hot Rod and REST clients can interact against the default or one of the named caches.
+ -->
<default>
- <!--
- isolation levels supported: READ_COMMITTED and REPEATABLE_READ
- -->
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500"
- useLockStriping="true"
- />
<!--
- Used to register a transaction manager and participate in ongoing transactions.
+ READ_COMMITTED is the only relevant isolation level for the data grid
+ Adjust concurrency level according to number of concurrent threads interacting with the cache
-->
- <transaction
- transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
- syncRollbackPhase="false"
- syncCommitPhase="false"
- useEagerLocking="false"/>
+ <locking isolationLevel="READ_COMMITTED"
+ lockAcquisitionTimeout="20000"
+ concurrencyLevel="500"
+ useLockStriping="false"
+ />
<!--
- Used to register JMX statistics in any available MBean server
+ Expose cache level statistics
-->
<jmxStatistics enabled="false"/>
- <lazyDeserialization enabled="false"/>
-
<!--
- Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
+ This element specifies that the cache is clustered.
+ modes supported: distribution (d), replication (r) or invalidation (i).
-->
- <invocationBatching enabled="false"/>
+ <clustering mode="distribution">
- <!--
- This element specifies that the cache is clustered.
- modes supported: distribution (d), replication (r) or invalidation (i).
- -->
- <clustering mode="replication">
-
<!--
- Defines whether to retrieve state on startup
+ Network calls are synchronous.
-->
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+ <sync replTimeout="20000"/>
<!--
- Network calls are synchronous.
+ numOwners: number of owners for each key. The larger this number is, the safer your data will be, but the
+ slower the cluster will be.
+
+ rehashRpcTimeout: timeout used for RPC calls relating to rehashing. This defaults to 600000 (10 minutes).
-->
- <sync replTimeout="20000"/>
+ <hash numOwners="2" rehashWait="120000" rehashRpcTimeout="600000"/>
+
<!--
- Uncomment this for async replication.
+ L1 cache enables more efficient reads in those nodes that don't own the data
+ The lifespan, defined in milliseconds, indicates how long data should live in L1
-->
- <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500"/>-->
- </clustering>
+ <l1 enabled="true"
+ lifespan="600000"
+ />
- </default>
-
- <!-- ************************************** -->
- <!-- Individually configured "named" caches -->
- <!-- ************************************** -->
-
- <namedCache name="asyncCache">
- <clustering mode="replication">
- <async asyncMarshalling="true"/>
</clustering>
- </namedCache>
- <!-- Note that any of the elements appearing in a namedCache section can also appear in the default section as a template. -->
- <namedCache name="evictionCache">
-
<!--
- Eviction configuration. WakeupInterval defines how often the eviction thread runs, in milliseconds. 0 means
- the eviction thread will never run. A separate executor is used for eviction in each cache.
+ Eviction configuration.
+
+ WakeupInterval defines how often the eviction thread runs, in milliseconds.
+ 0 means the eviction thread will never run.
-->
- <eviction wakeUpInterval="500" maxEntries="5000" strategy="FIFO" threadPolicy="PIGGYBACK"/>
- <expiration lifespan="60000" maxIdle="1000"/>
- </namedCache>
+ <eviction wakeUpInterval="500"
+ maxEntries="5000"
+ strategy="LIRS"
+ />
-
- <namedCache name="persistentCache">
<!--
- Cache loaders.
+ Expiration configuration allows you to limit how long each cache entry should live for.
- If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
- is accessed again, it is removed from the cache loaderold and loaded into memory.
+ <expiration lifespan="60000"
+ maxIdle="1000"
+ />
+ -->
- Otherwise, state is always maintained in the cache loaderold as well as in memory.
+ </default>
- Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the
- same database.
+ <namedCache name="sampleReplicatedCache">
- If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache.
- -->
- <loaders passivation="false" shared="false" preload="true">
+ <clustering mode="replication">
<!--
- We can have multiple cache loaders, which get chained
+ Defines whether to retrieve state on startup
-->
- <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true"
- ignoreModifications="true" purgeOnStartup="true">
+ <stateRetrieval timeout="20000"
+ fetchInMemoryState="false"
+ alwaysProvideInMemoryState="false"
+ />
- <!-- See the documentation for more configuration examples and flags. -->
- <properties>
- <property name="location" value="${java.io.tmpdir}"/>
- </properties>
- <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
- <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/>
- </loader>
- </loaders>
-
- <deadlockDetection enabled="true" spinDuration="1000"/>
-
- </namedCache>
-
- <namedCache name="distributedCache">
- <clustering mode="distribution">
- <sync/>
<!--
- num owners: number of owners for each key. The larger this number is, the safer your data will be, but the
- slower the cluster will be.
-
- rehashRpcTimeout: timeout used for RPC calls relating to rehashing. This defaults to 600000 (10 minutes).
+ Asynchronous replication with a replication queue that is flushed every replQueueInterval milliseconds
+ or when the replication queue has exceeded certain size.
-->
- <hash numOwners="3" rehashWait="120000" rehashRpcTimeout="600000"/>
- <l1 enabled="true" lifespan="600000"/>
- </clustering>
- </namedCache>
+ <async useReplQueue="true"
+ replQueueInterval="10000"
+ replQueueMaxElements="500"
+ asyncMarshalling="false"
+ />
- <namedCache name="withReplicatinQueue">
- <clustering>
- <async useReplQueue="true" replQueueInterval="100" replQueueMaxElements="200"/>
</clustering>
- </namedCache>
- <namedCache name="lockPerEntry">
- <locking useLockStriping="false" />
</namedCache>
- <namedCache name="cacheWithCustomInterceptors">
+ <namedCache name="samplePersistedCache">
+
<!--
- Define custom interceptors. All custom interceptors need to extend org.jboss.cache.interceptors.base.CommandInterceptor
+ Cache loaders.
+
+ If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
+ is accessed again, it is removed from the cache loaderold and loaded into memory.
+
+ Otherwise, state is always maintained in the cache loaderold as well as in memory.
+
+ Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the
+ same database.
+
+ If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache.
+
+ We can have multiple cache loaders, which get chained
-->
- <!--
- <customInterceptors>
- <interceptor position="first" class="com.mycompany.CustomInterceptor1">
- <property name="com.mycompany.attributeOne" value="value1" />
- <property name="com.mycompany.attributeTwo" value="value2" />
- </interceptor>
- <interceptor position="last" class="com.mycompany.CustomInterceptor2"/>
- <interceptor index="3" class="com.mycompany.CustomInterceptor1"/>
- <interceptor before="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor2"/>
- <interceptor after="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor1"/>
- </customInterceptors>
- -->
+
+ <loaders passivation="false"
+ shared="false"
+ preload="true">
+
+ <loader class="org.infinispan.loaders.file.FileCacheStore"
+ fetchPersistentState="false"
+ ignoreModifications="false"
+ purgeOnStartup="false">
+
+ <properties>
+ <property name="location"
+ value="${java.io.tmpdir}"
+ />
+ </properties>
+
+ <async enabled="false" />
+ </loader>
+ </loaders>
+
</namedCache>
-</infinispan>
+
+</infinispan>
\ No newline at end of file
Deleted: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-29 15:29:24 UTC (rev 108988)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-29 15:30:32 UTC (rev 108989)
@@ -1,58 +0,0 @@
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <UDP
- mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
- mcast_port="${jgroups.udp.mcast_port:46655}"
- bind_port="${jboss.jgroups.udp.bind_port:55200}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- enable_bundling="true"
- enable_diagnostics="false"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="30"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="Discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="30"
- 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="Discard"
- />
-
- <PING timeout="3000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK start_port="${jboss.jgroups.udp.fd_sock_port:54200}"/>
- <FD_ALL/>
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="0"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="300,600,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
- <FC max_credits="500000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
-</config>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list