JBoss Cache SVN: r6702 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-10 04:57:50 -0400 (Wed, 10 Sep 2008)
New Revision: 6702
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
Log:
chnaged loging
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-10 00:01:11 UTC (rev 6701)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-10 08:57:50 UTC (rev 6702)
@@ -213,7 +213,7 @@
recieversCount++;
}
catch (Exception e) {
-// log.warn("failure sending message to " + c, e);
+ log.trace("failure(" + e.getMessage() + ") sending message to " + c);
}
}
}
15 years, 8 months
JBoss Cache SVN: r6701 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-09-09 20:01:11 -0400 (Tue, 09 Sep 2008)
New Revision: 6701
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
Log:
Leaf nodes always return isChildrenLoaded = false
Add a workaround
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-09-09 18:05:45 UTC (rev 6700)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-09-10 00:01:11 UTC (rev 6701)
@@ -198,7 +198,7 @@
}
}
- private static boolean childrenLoaded(InternalNode<?, ?> node)
+ private boolean childrenLoaded(InternalNode<?, ?> node)
{
if (!node.isChildrenLoaded())
{
@@ -211,8 +211,15 @@
return false;
}
- if (!childrenLoaded(child))
+ if (child.hasChildren())
+ {
+ if (!childrenLoaded(child))
+ return false;
+ }
+ else if (!loaderNoChildren(child.getFqn()))
+ {
return false;
+ }
}
return true;
15 years, 8 months
JBoss Cache SVN: r6699 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-09 04:58:35 -0400 (Tue, 09 Sep 2008)
New Revision: 6699
Modified:
benchmarks/benchmark-fwk/trunk/bindAddress.sh
Log:
default is an env variable
Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh 2008-09-09 08:18:31 UTC (rev 6698)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh 2008-09-09 08:58:35 UTC (rev 6699)
@@ -1,5 +1,5 @@
#!/bin/sh
### Set your bind address for the tests to use. Could be an IP, host name or a reference to an environment variable.
-BIND_ADDRESS=127.0.0.1
+BIND_ADDRESS=${MYTESTIP_2}
15 years, 8 months
JBoss Cache SVN: r6698 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-09 04:18:31 -0400 (Tue, 09 Sep 2008)
New Revision: 6698
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async.xml
Log:
enabled bundling for async communication
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async-br.xml 2008-09-09 08:15:52 UTC (rev 6697)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async-br.xml 2008-09-09 08:18:31 UTC (rev 6698)
@@ -63,7 +63,7 @@
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- enable_bundling="false"
+ enable_bundling="true"
enable_unicast_bundling="false"
enable_diagnostics="false"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async.xml 2008-09-09 08:15:52 UTC (rev 6697)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/opt-repl-async.xml 2008-09-09 08:18:31 UTC (rev 6698)
@@ -71,7 +71,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
enable_diagnostics="false"
use_concurrent_stack="true"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async-br.xml 2008-09-09 08:15:52 UTC (rev 6697)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async-br.xml 2008-09-09 08:18:31 UTC (rev 6698)
@@ -71,7 +71,7 @@
max_bundle_size="64000"
max_bundle_timeout="30"
use_incoming_packet_handler="true"
- enable_bundling="false"
+ enable_bundling="true"
enable_unicast_bundling="false"
enable_diagnostics="false"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async.xml 2008-09-09 08:15:52 UTC (rev 6697)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.2.0/conf/pess-repl-async.xml 2008-09-09 08:18:31 UTC (rev 6698)
@@ -78,7 +78,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
ip_ttl="2"
- enable_bundling="false"
+ enable_bundling="true"
enable_diagnostics="false"
use_concurrent_stack="true"
15 years, 8 months
JBoss Cache SVN: r6697 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-09 04:15:52 -0400 (Tue, 09 Sep 2008)
New Revision: 6697
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
Log:
enabled bundling for async communication
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async-br.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-repl-async.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2"
loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2"
loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false"
enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-09-09 08:14:47 UTC (rev 6696)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-09-09 08:15:52 UTC (rev 6697)
@@ -5,7 +5,7 @@
<stateRetrieval timeout="20000" fetchInMemoryState="false"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
- <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2"
loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
15 years, 8 months
JBoss Cache SVN: r6696 - in benchmarks/benchmark-fwk/trunk: cache-products/jbosscache-1.4.1 and 4 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-09 04:14:47 -0400 (Tue, 09 Sep 2008)
New Revision: 6696
Added:
benchmarks/benchmark-fwk/trunk/jvm_params.sh
benchmarks/benchmark-fwk/trunk/lib/common/
Modified:
benchmarks/benchmark-fwk/trunk/bindAddress.sh
benchmarks/benchmark-fwk/trunk/build.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh
benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
added script to configure the JVM params
Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -1,5 +1,5 @@
#!/bin/sh
### Set your bind address for the tests to use. Could be an IP, host name or a reference to an environment variable.
-BIND_ADDRESS=${MYTESTIP_2}
+BIND_ADDRESS=127.0.0.1
Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/build.xml 2008-09-09 08:14:47 UTC (rev 6696)
@@ -209,6 +209,7 @@
nowarn="${compiler.generate.no.warnings}" fork="true">
<classpath>
<fileset dir="./cache-products/jbosscache-3.0.0/lib" includes="*.jar"/>
+ <fileset dir="./lib/common" includes="*.jar"/>
<pathelement location="./lib/commons-logging.jar"/>
<pathelement location="${framework.output.dir}"/>
</classpath>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -14,5 +14,5 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCacheWrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCacheWrapper"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -14,5 +14,5 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache200Wrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache200Wrapper"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -9,7 +9,7 @@
CLASSPATH=$CLASSPATH:./classes/production/terracotta-2.5.0
#other specific JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}"
+JVM_OPTIONS="$JVM_OPTIONS -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}"
JVM_OPTIONS="$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_linux_150_11.jar"
JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.TerracottaWrapper"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/cache-products/whirlycache-1.0.1/config.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -15,4 +15,4 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.WhirlyCacheWrapper"
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.WhirlyCacheWrapper"
Added: benchmarks/benchmark-fwk/trunk/jvm_params.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/jvm_params.sh (rev 0)
+++ benchmarks/benchmark-fwk/trunk/jvm_params.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+### sets the JVM params for the instance that triggers test runnings
+export JVM_XMS=256m
+export JVM_XMX=1024m
\ No newline at end of file
Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runNode.sh 2008-09-09 08:00:08 UTC (rev 6695)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh 2008-09-09 08:14:47 UTC (rev 6696)
@@ -50,9 +50,9 @@
fi
. ./bindAddress.sh
-echo bind address exit code is $?
+. ./jvm_params.sh
-JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
+JVM_OPTIONS="${JVM_OPTIONS} -Xms${JVM_XMS} -Xmx${JVM_XMX} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -Djava.net.preferIPv4Stack=${preferIPv4Stack}"
TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
if [ "$DEBUG" = "debug" ]
15 years, 8 months
JBoss Cache SVN: r6695 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-09 04:00:08 -0400 (Tue, 09 Sep 2008)
New Revision: 6695
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
Log:
guarded log calls
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-05 12:20:08 UTC (rev 6694)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-09 08:00:08 UTC (rev 6695)
@@ -65,7 +65,7 @@
public void start() throws Exception
{
srvSock = createServerSocket();
- log.trace("ServerSock created, listening on: "+ srvSock.getLocalSocketAddress());
+ if (log.isTraceEnabled()) log.trace("ServerSock created, listening on: "+ srvSock.getLocalSocketAddress());
localAddr = new InetSocketAddress(srvSock.getInetAddress(), srvSock.getLocalPort());
connectionTable.init();
@@ -79,7 +79,7 @@
try
{
Socket s = srvSock.accept();
- log.trace("Accepted client " + s.getRemoteSocketAddress());
+ if(log.isTraceEnabled()) log.trace("Accepted client " + s.getRemoteSocketAddress());
ReceiverThread r = new ReceiverThread(s);
r.setDaemon(true);
receivers.add(r);
@@ -134,7 +134,7 @@
{
isStoping = true;
server.close();
- log.trace("Successfully closed server socket " + server);
+ if (log.isTraceEnabled()) log.trace("Successfully closed server socket " + server);
} catch (IOException e)
{
log.warn("Failed to close servet socket for " + server + ", error is " + e.getMessage());
15 years, 8 months
JBoss Cache SVN: r6694 - in benchmarks/benchmark-fwk/trunk/src/org/cachebench: config and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-05 08:20:08 -0400 (Fri, 05 Sep 2008)
New Revision: 6694
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java
Log:
added additional logging and clusterconfig options
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-05 02:35:58 UTC (rev 6693)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-05 12:20:08 UTC (rev 6694)
@@ -268,6 +268,7 @@
void createSocket() throws IOException
{
+ log.trace("creating socket connection to host: '" + to.getAddress() + "', port:'" + to.getPort() + "'");
sock = new Socket(to.getAddress(), to.getPort());
sock.setSendBufferSize(max_send_buffer_size);
sock.setReceiveBufferSize(max_receiver_buffer_size);
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java 2008-09-05 02:35:58 UTC (rev 6693)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java 2008-09-05 12:20:08 UTC (rev 6694)
@@ -87,6 +87,10 @@
public String getBindAddress()
{
+ if (bindAddress == null)
+ {
+ bindAddress = System.getProperties().getProperty("bind.address");
+ }
return bindAddress;
}
15 years, 8 months
JBoss Cache SVN: r6693 - core/trunk/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-09-04 22:35:58 -0400 (Thu, 04 Sep 2008)
New Revision: 6693
Modified:
core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
Log:
Fix activation, which was skipping nested children, resulting in lost data
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-09-04 14:27:52 UTC (rev 6692)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-09-05 02:35:58 UTC (rev 6693)
@@ -210,6 +210,9 @@
{
return false;
}
+
+ if (!childrenLoaded(child))
+ return false;
}
return true;
15 years, 8 months
JBoss Cache SVN: r6692 - core/branches/1.4.X/src/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-09-04 10:27:52 -0400 (Thu, 04 Sep 2008)
New Revision: 6692
Modified:
core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
Log:
ups, this should be compilable with 1.4
Modified: core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
===================================================================
--- core/branches/1.4.X/src/org/jboss/cache/TreeCache.java 2008-09-04 14:25:23 UTC (rev 6691)
+++ core/branches/1.4.X/src/org/jboss/cache/TreeCache.java 2008-09-04 14:27:52 UTC (rev 6692)
@@ -4308,9 +4308,10 @@
{
if (log.isDebugEnabled()) log.debug("Node " + f + " NOT marked for removal as expected, not removing!");
//also check whether children are marked for deletion, JBCACHE-1406
- for (Object o : n.getChildren(true).values())
+ Iterator iterator = n.getChildren(true).values().iterator();
+ while (iterator.hasNext())
{
- DataNode data = (DataNode) o;
+ DataNode data = (DataNode) iterator.next();
realRemove(data.getFqn(), skipMarkerCheck);
}
}
15 years, 8 months