Author: bela(a)jboss.com
Date: 2008-01-08 12:35:42 -0500 (Tue, 08 Jan 2008)
New Revision: 5073
Added:
benchmarks/CacheTests/trunk/conf/
benchmarks/CacheTests/trunk/conf/config.xml
Removed:
benchmarks/CacheTests/trunk/config.xml
Modified:
benchmarks/CacheTests/trunk/pc.sh
benchmarks/CacheTests/trunk/run.sh
benchmarks/CacheTests/trunk/tmp.sh
Log:
moved config.xml to conf
Copied: benchmarks/CacheTests/trunk/conf/config.xml (from rev 5072,
benchmarks/CacheTests/trunk/config.xml)
===================================================================
--- benchmarks/CacheTests/trunk/conf/config.xml (rev 0)
+++ benchmarks/CacheTests/trunk/conf/config.xml 2008-01-08 17:35:42 UTC (rev 5073)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute
name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+ <!--
+ Isolation level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--<attribute
name="NodeLockingScheme">OPTIMISTIC</attribute>-->
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_ASYNC</attribute>
+
+ <!--
+ Just used for async repl: use a replication queue
+ -->
+ <attribute name="UseReplQueue">false</attribute>
+
+ <!--
+ Replication interval for replication queue (in ms)
+ -->
+ <attribute name="ReplQueueInterval">0</attribute>
+
+ <!--
+ Max number of elements which trigger replication
+ -->
+ <attribute name="ReplQueueMaxElements">0</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute
name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute
name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully
initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <!--<UDP mcast_addr="232.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="false"
+ enable_unicast_bundling="false"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+
oob_thread_pool.rejection_policy="Run"/>-->
+
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000"
num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" 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"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST
timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true"
join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true"
view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+ <!--
+ Whether or not to fetch state on joining a cluster
+ NOTE this used to be called FetchStateOnStartup and has been renamed to be more
descriptive.
+ -->
+ <attribute name="FetchInMemoryState">true</attribute>
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">15000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+ <!--
+ Indicate whether to use region based marshalling or not. Set this to true if you
are running under a scoped
+ class loader, e.g., inside an application server. Default is "false".
+ -->
+ <attribute name="UseRegionBasedMarshalling">true</attribute>
+
+
+ <attribute name="BuddyReplicationConfig">
+ <config>
+
+ <!-- Enables buddy replication. This is the ONLY mandatory
configuration element here. -->
+ <buddyReplicationEnabled>true</buddyReplicationEnabled>
+
+ <!-- These are the default values anyway -->
+
<buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
+
+ <!-- numBuddies is the number of backup nodes each node maintains.
ignoreColocatedBuddies means
+ that each node will *try* to select a buddy on a different physical host. If
not able to do so though,
+ it will fall back to colocated nodes. -->
+ <buddyLocatorProperties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </buddyLocatorProperties>
+
+ <!-- A way to specify a preferred replication group. If specified, we
try and pick a buddy which shares
+ the same pool name (falling back to other buddies if not available). This
allows the sysdmin to
+ hint at backup buddies are picked, so for example, nodes may be hinted topick
buddies on a different
+ physical rack or power supply for added fault tolerance. -->
+ <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+ <!-- Communication timeout for inter-buddy group organisation messages
(such as assigning to and
+ removing from groups, defaults to 1000. -->
+ <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+ <!-- Whether data is removed from old owners when gravitated to a new
owner. Defaults to true. -->
+
<dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+
+ <!-- Whether backup nodes can respond to data gravitation requests, or
only the data owner is
+ supposed to respond. Defaults to true. -->
+
<dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
+
+ <!-- Whether all cache misses result in a data gravitation request.
Defaults to false, requiring
+ callers to enable data gravitation on a per-invocation basis using the Options
API. -->
+ <autoDataGravitation>false</autoDataGravitation>
+
+ </config>
+ </attribute>
+
+
+ </mbean>
+
+
+ <!-- Uncomment to get a graphical view of the TreeCache MBean above -->
+ <!-- <mbean code="org.jboss.cache.TreeCacheView"
name="jboss.cache:service=TreeCacheView">-->
+ <!-- <depends>jboss.cache:service=TreeCache</depends>-->
+ <!-- <attribute
name="CacheService">jboss.cache:service=TreeCache</attribute>-->
+ <!-- </mbean>-->
+
+
+</server>
Property changes on: benchmarks/CacheTests/trunk/conf/config.xml
___________________________________________________________________
Name: svn:executable
+
Name: svn:keywords
+ Rev Id HeadURL
Deleted: benchmarks/CacheTests/trunk/config.xml
===================================================================
--- benchmarks/CacheTests/trunk/config.xml 2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/config.xml 2008-01-08 17:35:42 UTC (rev 5073)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=TreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute
name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
- <!--
- Isolation level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--<attribute
name="NodeLockingScheme">OPTIMISTIC</attribute>-->
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">REPL_ASYNC</attribute>
-
- <!--
- Just used for async repl: use a replication queue
- -->
- <attribute name="UseReplQueue">false</attribute>
-
- <!--
- Replication interval for replication queue (in ms)
- -->
- <attribute name="ReplQueueInterval">0</attribute>
-
- <!--
- Max number of elements which trigger replication
- -->
- <attribute name="ReplQueueMaxElements">0</attribute>
-
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute
name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute
name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties.
- ClusterConfig isn't used if the multiplexer is enabled and successfully
initialized.
- -->
- <attribute name="ClusterConfig">
- <config>
- <!--<UDP mcast_addr="232.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="false"
- enable_unicast_bundling="false"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="4"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
-
oob_thread_pool.rejection_policy="Run"/>-->
-
- <TCP recv_buf_size="20000000" use_send_queues="false"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- enable_unicast_bundling="true"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="4"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
-
- <!--<PING timeout="2000"
num_initial_members="3"/>-->
- <MPING mcast_addr="232.1.2.3" 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"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <!--<UNICAST
timeout="30,60,120,300,600,1200,2400,3600"/>-->
- <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true"
join_timeout="5000"
- join_retry_timeout="2000" shun="false"
- view_bundling="true"
view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </attribute>
-
-
- <!--
- Whether or not to fetch state on joining a cluster
- NOTE this used to be called FetchStateOnStartup and has been renamed to be more
descriptive.
- -->
- <attribute name="FetchInMemoryState">true</attribute>
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">15000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">15000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
- <!--
- Indicate whether to use region based marshalling or not. Set this to true if you
are running under a scoped
- class loader, e.g., inside an application server. Default is "false".
- -->
- <attribute name="UseRegionBasedMarshalling">true</attribute>
-
-
- <attribute name="BuddyReplicationConfig">
- <config>
-
- <!-- Enables buddy replication. This is the ONLY mandatory
configuration element here. -->
- <buddyReplicationEnabled>true</buddyReplicationEnabled>
-
- <!-- These are the default values anyway -->
-
<buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
-
- <!-- numBuddies is the number of backup nodes each node maintains.
ignoreColocatedBuddies means
- that each node will *try* to select a buddy on a different physical host. If
not able to do so though,
- it will fall back to colocated nodes. -->
- <buddyLocatorProperties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </buddyLocatorProperties>
-
- <!-- A way to specify a preferred replication group. If specified, we
try and pick a buddy which shares
- the same pool name (falling back to other buddies if not available). This
allows the sysdmin to
- hint at backup buddies are picked, so for example, nodes may be hinted topick
buddies on a different
- physical rack or power supply for added fault tolerance. -->
- <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
- <!-- Communication timeout for inter-buddy group organisation messages
(such as assigning to and
- removing from groups, defaults to 1000. -->
- <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
- <!-- Whether data is removed from old owners when gravitated to a new
owner. Defaults to true. -->
-
<dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-
- <!-- Whether backup nodes can respond to data gravitation requests, or
only the data owner is
- supposed to respond. Defaults to true. -->
-
<dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
-
- <!-- Whether all cache misses result in a data gravitation request.
Defaults to false, requiring
- callers to enable data gravitation on a per-invocation basis using the Options
API. -->
- <autoDataGravitation>false</autoDataGravitation>
-
- </config>
- </attribute>
-
-
- </mbean>
-
-
- <!-- Uncomment to get a graphical view of the TreeCache MBean above -->
- <!-- <mbean code="org.jboss.cache.TreeCacheView"
name="jboss.cache:service=TreeCacheView">-->
- <!-- <depends>jboss.cache:service=TreeCache</depends>-->
- <!-- <attribute
name="CacheService">jboss.cache:service=TreeCache</attribute>-->
- <!-- </mbean>-->
-
-
-</server>
Modified: benchmarks/CacheTests/trunk/pc.sh
===================================================================
--- benchmarks/CacheTests/trunk/pc.sh 2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/pc.sh 2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
CP=$CP:${i}
done
-CP=./classes:$CP
+CP=./conf:./classes:$CP
java -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${HOME}/log4j.properties
-Djgroups.bind_addr=$MYTESTIP_1 -classpath ${CP} -javaagent:lib/jboss-aop.jar
-Djboss.aop.path=./pojocache-aop.xml perf.SessionTest -factory
perf.pojocache.SessionFactoryPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*
Modified: benchmarks/CacheTests/trunk/run.sh
===================================================================
--- benchmarks/CacheTests/trunk/run.sh 2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/run.sh 2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
CP=$CP:${i}
done
-CP=./classes:$CP
+CP=./conf:./classes:$CP
java -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${HOME}/log4j.properties
-Djgroups.bind_addr=$MYTESTIP_1 -classpath ${CP} perf.SessionTest -num_requests 100000
-num_attrs 100 -size 1000 -id 1 $*
Modified: benchmarks/CacheTests/trunk/tmp.sh
===================================================================
--- benchmarks/CacheTests/trunk/tmp.sh 2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/tmp.sh 2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
CP=$CP:${i}
done
-CP=./classes:$CP
+CP=./conf:./classes:$CP
java -Dlog4j.configuration=file:${HOME}/log4j.properties -Djgroups.bind_addr=192.168.2.5
-classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.aop.path=./pojocache-aop.xml
perf.SessionTestPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*