JBoss Cache SVN: r5264 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 12:38:21 -0500 (Wed, 30 Jan 2008)
New Revision: 5264
Modified:
benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Log:
Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-30 16:21:33 UTC (rev 5263)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-30 17:38:21 UTC (rev 5264)
@@ -1,7 +1,7 @@
#!/bin/bash
-# scaling="2 4 6 8 10"
-scaling="2 4 6"
+scaling="2 4 6 8 10"
+#scaling="2 4 6"
configs="pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml"
products="jbosscache-2.0.0 jbosscache-2.1.0"
@@ -17,7 +17,7 @@
while [ ! -e performance-$size.csv ]
do
echo Waiting for report...
- sleep 30
+ sleep 60
done
sleep 60
mv performance-$size.csv output/$product-$config-$size.csv
16 years, 3 months
JBoss Cache SVN: r5263 - core/trunk/src/main/java/org/jboss/cache/factories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 11:21:33 -0500 (Wed, 30 Jan 2008)
New Revision: 5263
Modified:
core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
Added a null check
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-01-30 16:21:16 UTC (rev 5262)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-01-30 16:21:33 UTC (rev 5263)
@@ -753,37 +753,42 @@
deepRecursionDetector = true;
for (Component d : dependentComponents)
{
- if (d.instance == null)
+ if (d != null)
{
- // this is a "hollow" component that has not been constructed yet. Another "constructed" version probably exists in the
- // componentLookup. Make sure we replace this.
- Component c = componentLookup.get(d.name);
- if (increase)
+ if (d.instance == null)
{
- dependencies.remove(d);
- dependencies.add(c);
+ // this is a "hollow" component that has not been constructed yet. Another "constructed" version probably exists in the
+ // componentLookup. Make sure we replace this.
+ Component c = componentLookup.get(d.name);
+ if (increase)
+ {
+ dependencies.remove(d);
+ dependencies.add(c);
+ }
+ else
+ {
+ dependencyFor.remove(d);
+ dependencies.add(c);
+ }
+ d = c;
}
- else
- {
- dependencyFor.remove(d);
- dependencies.add(c);
- }
- d = c;
- }
- if (isShallowCyclic(d))
- {
- // don't process shallow cyclic deps here - shoud do that after we set our state.
- shallowCyclic.add(d);
- }
- else
- {
- // of we are "moving up" - only do this if the component is lower than what is needed.
- if ((increase && newState.isGreaterThan(d.state)) || (!increase && newState.isLessThan(d.state)))
+ if (d != null)
{
- d.changeState(newState);
+ if (isShallowCyclic(d))
+ {
+ // don't process shallow cyclic deps here - shoud do that after we set our state.
+ shallowCyclic.add(d);
+ }
+ else
+ {
+ // of we are "moving up" - only do this if the component is lower than what is needed.
+ if ((increase && newState.isGreaterThan(d.state)) || (!increase && newState.isLessThan(d.state)))
+ {
+ d.changeState(newState);
+ }
+ }
}
-
}
}
@@ -826,7 +831,7 @@
*/
private boolean isShallowCyclic(Component c)
{
- return (dependencies.contains(c) && c.dependencies.contains(this));
+ return dependencies.contains(c) && c.dependencies.contains(this);
}
/**
16 years, 3 months
JBoss Cache SVN: r5262 - core/trunk/src/test/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 11:21:16 -0500 (Wed, 30 Jan 2008)
New Revision: 5262
Removed:
core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java
Log:
JBCACHE-1280 - replication queue messages fail on remote node
Deleted: core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java 2008-01-30 15:59:17 UTC (rev 5261)
+++ core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java 2008-01-30 16:21:16 UTC (rev 5262)
@@ -1,38 +0,0 @@
-package org.jboss.cache;
-
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.Test;
-
-/**
- * Added test to replicate a behavior noticed on certain configs.
- * N.B. This test is not in its final form, it just reproduced the issue and a more appropriate test should
- * replace it after narrowing down the issues. The pess-repl-async-issue.xml config file should be deleted aswell.
- * - guess the issue is caused by using replication q
- */
-@Test(groups = "functional")
-public class AsyncReplicationQueusFailureTest
-{
- private static final int COUNT = 10;
- private static final String CONFIG_FILE = "META-INF/pess-repl-async-issue.xml";
-
- public void testFailure() throws InterruptedException
- {
- Cache cache = DefaultCacheFactory.getInstance().createCache(CONFIG_FILE);
- Cache cache2 = DefaultCacheFactory.getInstance().createCache(CONFIG_FILE);
- for (int i = 0; i < COUNT; i++)//if we rise the count to 100k then lots of class cast exception are triggered by JGroups threads
- {
- System.out.println("on put i = " + i);
- cache.put("/a/b/c" + i,"key", "value");
- assertNotNull(cache.get("/a/b/c" + i,"key"));
- }
- Thread.sleep(10000);
- for (int i = 0; i < COUNT; i++)
- {
- System.out.println("on get i = " + i);
- assertNotNull(cache2.get("/a/b/c" + i,"key"));
- }
-
- cache.stop();
- cache2.stop();
- }
-}
16 years, 3 months
JBoss Cache SVN: r5261 - in benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:59:17 -0500 (Wed, 30 Jan 2008)
New Revision: 5261
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml
Log:
Updated cfgs not to use repl queue
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">true</attribute>
+ <attribute name="UseReplQueue">false</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">100</attribute>
+ <attribute name="ReplQueueMaxElements">0</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">true</attribute>
+ <attribute name="UseReplQueue">false</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">100</attribute>
+ <attribute name="ReplQueueMaxElements">0</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">true</attribute>
+ <attribute name="UseReplQueue">false</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">100</attribute>
+ <attribute name="ReplQueueMaxElements">0</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">true</attribute>
+ <attribute name="UseReplQueue">false</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">100</attribute>
+ <attribute name="ReplQueueMaxElements">0</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
16 years, 3 months
JBoss Cache SVN: r5260 - in benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:49:22 -0500 (Wed, 30 Jan 2008)
New Revision: 5260
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jbosscache-core.jar
Log:
Updated alegrias snapshot
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-30 15:38:36 UTC (rev 5259)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-30 15:49:22 UTC (rev 5260)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">false</attribute>
+ <attribute name="UseReplQueue">true</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">0</attribute>
+ <attribute name="ReplQueueMaxElements">100</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-30 15:38:36 UTC (rev 5259)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-30 15:49:22 UTC (rev 5260)
@@ -14,9 +14,9 @@
<attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">false</attribute>
+ <attribute name="UseReplQueue">true</attribute>
<attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">0</attribute>
+ <attribute name="ReplQueueMaxElements">100</attribute>
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jbosscache-core.jar
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Cache SVN: r5259 - in core/trunk/src: test/java/org/jboss/cache/replicated and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:38:36 -0500 (Wed, 30 Jan 2008)
New Revision: 5259
Added:
core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTest.java
Removed:
core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocationDelegate.java
Log:
JBCACHE-1280 - replication queue messages fail on remote node
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocationDelegate.java 2008-01-29 18:53:19 UTC (rev 5258)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocationDelegate.java 2008-01-30 15:38:36 UTC (rev 5259)
@@ -129,7 +129,7 @@
*/
public void _replicate(List<MethodCall> methodCalls) throws Throwable
{
- for (MethodCall methodCall : methodCalls) _replicate(methodCall);
+ for (MethodCall methodCall : methodCalls) _replicate((MethodCall) methodCall.getArgs()[0]);
}
public void block()
Copied: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTest.java (from rev 5258, core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTest.java 2008-01-30 15:38:36 UTC (rev 5259)
@@ -0,0 +1,50 @@
+package org.jboss.cache.replicated;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.misc.TestingUtil;
+import static org.testng.AssertJUnit.assertNotNull;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Test(groups = "functional")
+public class ReplicationQueueTest
+{
+ private static final int COUNT = 10;
+ private static final String CONFIG_FILE = "META-INF/pess-repl-async-issue.xml";
+ Cache cache, cache2;
+
+ @BeforeMethod
+ public void setUp() throws CloneNotSupportedException
+ {
+ cache = new DefaultCacheFactory().createCache(false);
+ cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_ASYNC);
+ cache.getConfiguration().setUseReplQueue(true);
+ cache.getConfiguration().setReplQueueMaxElements(COUNT);
+ cache.start();
+
+ cache2 = new DefaultCacheFactory().createCache(cache.getConfiguration().clone());
+
+ TestingUtil.blockUntilViewsReceived(60000, cache, cache2);
+ }
+
+ @AfterMethod
+ public void tearDown()
+ {
+ TestingUtil.killCaches(cache, cache2);
+ }
+
+ public void testFailure() throws InterruptedException
+ {
+ for (int i = 0; i < COUNT; i++)
+ {
+ System.out.println("on put i = " + i);
+ cache.put("/a/b/c" + i, "key", "value");
+ assertNotNull(cache.get("/a/b/c" + i, "key"));
+ }
+ Thread.sleep(2000);
+ for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key"));
+ }
+}
Deleted: core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
===================================================================
--- core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml 2008-01-29 18:53:19 UTC (rev 5258)
+++ core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml 2008-01-30 15:38:36 UTC (rev 5259)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
-
-
- <mbean code="org.jboss.cache.CacheImpl"
- name="jboss.cache:service=TreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
- <attribute name="CacheMode">REPL_ASYNC</attribute>
- <attribute name="UseReplQueue">true</attribute>
- <attribute name="ReplQueueInterval">0</attribute>
- <attribute name="ReplQueueMaxElements">100</attribute>
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
- <attribute name="ClusterConfig">
- <config>
- <UDP mcast_addr="232.10.10.10"
- mcast_port="45599"
- 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"
- use_outgoing_packet_handler="false"
- ip_ttl="2"
- down_thread="false" up_thread="false"
- enable_bundling="false"/>
- <PING timeout="2000"
- down_thread="false" up_thread="false" num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- down_thread="false" up_thread="false" min_interval="20000"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="1000" max_tries="2" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- down_thread="false" up_thread="false"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
- down_thread="false" up_thread="false"
- join_retry_timeout="2000" shun="false"
- view_bundling="true"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
- <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
- use_flush="true" flush_timeout="3000" use_reading_thread="true"/> -->
- <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
- <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/>
- </config>
- </attribute>
- <attribute name="FetchInMemoryState">false</attribute>
- <attribute name="InitialStateRetrievalTimeout">15000</attribute>
- <attribute name="SyncReplTimeout">60000</attribute>
- <attribute name="LockAcquisitionTimeout">10000</attribute>
- <attribute name="EvictionPolicyConfig">
- </attribute>
-
- <attribute name="CacheLoaderConfiguration">
- </attribute>
-
- <attribute name="UseRegionBasedMarshalling">false</attribute>
- </mbean>
-</server>
16 years, 3 months
JBoss Cache SVN: r5258 - benchmarks/benchmark-fwk/trunk/src/org/cachebench.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-29 13:53:19 -0500 (Tue, 29 Jan 2008)
New Revision: 5258
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
Log:
the runner will also cactch Throwable, so that now it will log OOM exceptions if they appear
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-29 18:52:21 UTC (rev 5257)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-29 18:53:19 UTC (rev 5258)
@@ -79,7 +79,7 @@
}
logger.info("Benchmarking Completed. Hope you enjoyed using this! \n");
}
- catch (Exception e)
+ catch (Throwable e)
{
logger.warn("Unable to parse configuration file " + confFile + ". Application terminated", e);
errorLogger.fatal("Unable to parse configuration file " + confFile, e);
16 years, 3 months
JBoss Cache SVN: r5257 - benchmarks/benchmark-fwk/trunk/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-29 13:52:21 -0500 (Tue, 29 Jan 2008)
New Revision: 5257
Modified:
benchmarks/benchmark-fwk/trunk/conf/log4j.xml
Log:
by default logging to console rather than file
Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2008-01-29 18:35:51 UTC (rev 5256)
+++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2008-01-29 18:52:21 UTC (rev 5257)
@@ -45,6 +45,7 @@
<category name="org.cachebench" additivity="false">
<priority value="TRACE"/>
<appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
</category>
<category name="net.sf.ehcache" additivity="false">
@@ -76,7 +77,8 @@
<!-- Here goes the root -->
<root>
<priority value ="INFO" />
- <appender-ref ref="FILE" />
+ <!--<appender-ref ref="FILE" />-->
+ <appender-ref ref="CONSOLE" />
</root>
</log4j:configuration>
16 years, 3 months
JBoss Cache SVN: r5256 - in core/trunk/src/test: resources/META-INF and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-29 13:35:51 -0500 (Tue, 29 Jan 2008)
New Revision: 5256
Added:
core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java
core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
Log:
Added: core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTest.java 2008-01-29 18:35:51 UTC (rev 5256)
@@ -0,0 +1,38 @@
+package org.jboss.cache;
+
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+
+/**
+ * Added test to replicate a behavior noticed on certain configs.
+ * N.B. This test is not in its final form, it just reproduced the issue and a more appropriate test should
+ * replace it after narrowing down the issues. The pess-repl-async-issue.xml config file should be deleted aswell.
+ * - guess the issue is caused by using replication q
+ */
+@Test(groups = "functional")
+public class AsyncReplicationQueusFailureTest
+{
+ private static final int COUNT = 10;
+ private static final String CONFIG_FILE = "META-INF/pess-repl-async-issue.xml";
+
+ public void testFailure() throws InterruptedException
+ {
+ Cache cache = DefaultCacheFactory.getInstance().createCache(CONFIG_FILE);
+ Cache cache2 = DefaultCacheFactory.getInstance().createCache(CONFIG_FILE);
+ for (int i = 0; i < COUNT; i++)//if we rise the count to 100k then lots of class cast exception are triggered by JGroups threads
+ {
+ System.out.println("on put i = " + i);
+ cache.put("/a/b/c" + i,"key", "value");
+ assertNotNull(cache.get("/a/b/c" + i,"key"));
+ }
+ Thread.sleep(10000);
+ for (int i = 0; i < COUNT; i++)
+ {
+ System.out.println("on get i = " + i);
+ assertNotNull(cache2.get("/a/b/c" + i,"key"));
+ }
+
+ cache.stop();
+ cache2.stop();
+ }
+}
Added: core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
===================================================================
--- core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml (rev 0)
+++ core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml 2008-01-29 18:35:51 UTC (rev 5256)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <mbean code="org.jboss.cache.CacheImpl"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+ <attribute name="CacheMode">REPL_ASYNC</attribute>
+ <attribute name="UseReplQueue">true</attribute>
+ <attribute name="ReplQueueInterval">0</attribute>
+ <attribute name="ReplQueueMaxElements">100</attribute>
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="232.10.10.10"
+ mcast_port="45599"
+ 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"
+ use_outgoing_packet_handler="false"
+ ip_ttl="2"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"/>
+ <PING timeout="2000"
+ down_thread="false" up_thread="false" num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="1000" max_tries="2" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"
+ down_thread="false" up_thread="false"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ down_thread="false" up_thread="false"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ down_thread="false" up_thread="false"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true"/>
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+ use_flush="true" flush_timeout="3000" use_reading_thread="true"/> -->
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
+ <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/>
+ </config>
+ </attribute>
+ <attribute name="FetchInMemoryState">false</attribute>
+ <attribute name="InitialStateRetrievalTimeout">15000</attribute>
+ <attribute name="SyncReplTimeout">60000</attribute>
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+ <attribute name="EvictionPolicyConfig">
+ </attribute>
+
+ <attribute name="CacheLoaderConfiguration">
+ </attribute>
+
+ <attribute name="UseRegionBasedMarshalling">false</attribute>
+ </mbean>
+</server>
16 years, 3 months
JBoss Cache SVN: r5255 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-29 13:02:28 -0500 (Tue, 29 Jan 2008)
New Revision: 5255
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml
Log:
rollback to previous version
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-29 17:01:11 UTC (rev 5254)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-29 18:02:28 UTC (rev 5255)
@@ -20,121 +20,52 @@
<attribute name="ClusterName">JBossCache-Cluster</attribute>
<attribute name="ClusterConfig">
<config>
- <TCP start_port="7580"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- use_concurrent_stack="true"
-
- recv_buf_size="20000000"
- send_buf_size="20000000"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="4"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="100000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="4"
- 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"/>
-
- <MPING timeout="2000" mcast_addr="232.1.2.3"
- num_initial_members="3"/>
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="1000" max_tries="2" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="true"/>
- <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="10000000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER />
-
- </config>
-
-
- <attribute name="ClusterConfig">
- <config>
- <TCP recv_buf_size="20000000" use_send_queues="false"
+ <UDP mcast_addr="232.10.10.10"
+ mcast_port="45599"
+ 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"
- 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"
+ use_outgoing_packet_handler="false"
+ ip_ttl="2"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"/>
+ <PING timeout="2000"
+ down_thread="false" up_thread="false" num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="1000" max_tries="2" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
- <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <UNICAST timeout="300,600,1200,2400,3600"
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ down_thread="false" up_thread="false"
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"/>
+ view_bundling="true"/>
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+ use_flush="true" flush_timeout="3000" use_reading_thread="true"/> -->
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
+ <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/>
</config>
</attribute>
-
- </attribute>
<attribute name="FetchInMemoryState">false</attribute>
<attribute name="InitialStateRetrievalTimeout">15000</attribute>
<attribute name="SyncReplTimeout">60000</attribute>
16 years, 3 months