[exo-jcr-commits] exo-jcr SVN: r2322 - in jcr/trunk/exo.jcr.component.core/src: main/resources/conf/portal/cluster and 1 other directories.

Author: pnedonosko Date: 2010-04-23 06:09:38 -0400 (Fri, 23 Apr 2010) New Revision: 2322 Added: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-data.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-indexer.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-lock.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml Removed: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-data.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-indexer.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-lock.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/udp-mux.xml Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml Log: EXOJCR-682 clustered cache config samples moved to /conf/portal/cluster; LRU algo by default Copied: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-data.xml (from rev 2300, jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-data.xml) =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-data.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-data.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <!-- default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="1000000" /> + <property name="warnNoExpirationKey" value="false" /> + </default --> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> + <property name="maxNodes" value="50000" /> + <property name="timeToLive" value="60000" /> + </default> + </eviction> +</jbosscache> \ No newline at end of file Copied: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-indexer.xml (from rev 2300, jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-indexer.xml) =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-indexer.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-indexer.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> + <property name="maxNodes" value="10000" /> + <property name="minTimeToLive" value="60000" /> + </default> + </eviction> + +</jbosscache> Copied: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-lock.xml (from rev 2300, jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-lock.xml) =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-lock.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/jbosscache-lock.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <!-- + For another cache-loader class you should use another template with + cache-loader specific parameters + --> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} + cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} + cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} + cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} + cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} + cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} + cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} + cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} + cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} + cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} + </properties> + </loader> + + </loaders> + +</jbosscache> Copied: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml (from rev 2300, jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/udp-mux.xml) =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -0,0 +1,33 @@ +<protocol_stacks> + <stack name="jcr.stack"> + <config> + <UDP mcast_addr="228.10.10.10" mcast_port="45588" 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="2" enable_bundling="true" enable_diagnostics="true" + thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true" + thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" 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="30000" min_interval="10000" /> + <FD_SOCK /> + <FD timeout="10000" max_tries="5" shun="true" /> + <VERIFY_SUSPECT timeout="1500" /> + <BARRIER /> + <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true" + gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" /> + <UNICAST timeout="300,600,1200" /> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" /> + <VIEW_SYNC avg_send_interval="60000" /> + <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" /> + <FC max_credits="500000" min_threshold="0.20" /> + <FRAG2 frag_size="60000" /> + <!--pbcast.STREAMING_STATE_TRANSFER /--> + <pbcast.STATE_TRANSFER /> + <!-- pbcast.FLUSH /--> + </config> + </stack> +</protocol_stacks> Deleted: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-data.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-data.xml 2010-04-23 08:18:15 UTC (rev 2321) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-data.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" - lockAcquisitionTimeout="20000" /> - - <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> - <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> - <sync /> - </clustering> - - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" - actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" - eventQueueSize="1000000"> - <property name="maxNodes" value="1000000" /> - <property name="warnNoExpirationKey" value="false" /> - </default> - </eviction> -</jbosscache> \ No newline at end of file Deleted: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-indexer.xml 2010-04-23 08:18:15 UTC (rev 2321) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-indexer.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" - lockAcquisitionTimeout="20000" /> - - <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> - <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> - <sync /> - </clustering> - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> - <property name="maxNodes" value="10000" /> - <property name="minTimeToLive" value="60000" /> - </default> - </eviction> - -</jbosscache> Deleted: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-lock.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-lock.xml 2010-04-23 08:18:15 UTC (rev 2321) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/jbosscache-lock.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" - lockAcquisitionTimeout="20000" /> - - <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> - <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> - <sync /> - </clustering> - - <loaders passivation="false" shared="true"> - <preload> - <node fqn="/" /> - </preload> - <!-- - For another cache-loader class you should use another template with - cache-loader specific parameters - --> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false" purgeOnStartup="false"> - <properties> - cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} - cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} - cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} - cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} - cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} - cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} - cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} - cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} - cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} - cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} - </properties> - </loader> - - </loaders> - -</jbosscache> Deleted: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/udp-mux.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/udp-mux.xml 2010-04-23 08:18:15 UTC (rev 2321) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/udp-mux.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -1,33 +0,0 @@ -<protocol_stacks> - <stack name="jcr.stack"> - <config> - <UDP mcast_addr="228.10.10.10" mcast_port="45588" 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="2" enable_bundling="true" enable_diagnostics="true" - thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2" - thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true" - thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" 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="30000" min_interval="10000" /> - <FD_SOCK /> - <FD timeout="10000" max_tries="5" shun="true" /> - <VERIFY_SUSPECT timeout="1500" /> - <BARRIER /> - <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true" - gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" /> - <UNICAST timeout="300,600,1200" /> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" /> - <VIEW_SYNC avg_send_interval="60000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" /> - <FC max_credits="500000" min_threshold="0.20" /> - <FRAG2 frag_size="60000" /> - <!--pbcast.STREAMING_STATE_TRANSFER /--> - <pbcast.STATE_TRANSFER /> - <!-- pbcast.FLUSH /--> - </config> - </stack> -</protocol_stacks> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-04-23 08:18:15 UTC (rev 2321) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-04-23 10:09:38 UTC (rev 2322) @@ -11,18 +11,11 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" - eventQueueSize="1000000"> - <property name="maxNodes" value="50000" /> - <property name="warnNoExpirationKey" value="false" /> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> - <property name="maxNodes" value="50000" /> - <property name="timeToLive" value="30000" /> + <property name="maxNodes" value="5000" /> + <property name="timeToLive" value="60000" /> </default> - - </default> </eviction> </jbosscache>