JBoss Cache SVN: r4966 - in core/trunk/src: test/java/org/jboss/cache/loader and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-03 08:20:31 -0500 (Thu, 03 Jan 2008)
New Revision: 4966
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java
Log:
Fixed CCL making remote calls before the cache is started
Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2008-01-03 12:42:32 UTC (rev 4965)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2008-01-03 13:20:31 UTC (rev 4966)
@@ -9,6 +9,7 @@
import net.jcip.annotations.ThreadSafe;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheStatus;
import org.jboss.cache.Fqn;
import org.jboss.cache.Modification;
import org.jboss.cache.NodeSPI;
@@ -48,6 +49,17 @@
private ClusteredCacheLoaderConfig config;
/**
+ * A test to check whether the cache is in it's started state. If not, calls should not be made as the channel may
+ * not have properly started, blocks due to state transfers may be in progress, etc.
+ *
+ * @return true if the cache is in it's STARTED state.
+ */
+ protected boolean isCacheReady()
+ {
+ return cache.getCacheStatus() == CacheStatus.STARTED;
+ }
+
+ /**
* Sets the configuration.
* A property <code>timeout</code> is used as the timeout value.
*/
@@ -70,7 +82,7 @@
public Set getChildrenNames(Fqn fqn) throws Exception
{
- if (!cache.getInvocationContext().isOriginLocal()) return Collections.emptySet();
+ if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return Collections.emptySet();
lock.acquireLock(fqn, true);
try
{
@@ -143,7 +155,7 @@
protected Map get0(Fqn name) throws Exception
{
// DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103
- if (!cache.getInvocationContext().isOriginLocal()) return Collections.emptyMap();
+ if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return Collections.emptyMap();
lock.acquireLock(name, true);
try
{
@@ -160,7 +172,7 @@
public boolean exists(Fqn name) throws Exception
{
// DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103
- if (!cache.getInvocationContext().isOriginLocal()) return false;
+ if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return false;
lock.acquireLock(name, false);
try
@@ -178,32 +190,26 @@
public Object put(Fqn name, Object key, Object value) throws Exception
{
- if (cache.getInvocationContext().isOriginLocal())
+ // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103
+ if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return null;
+ lock.acquireLock(name, true);
+ try
{
- lock.acquireLock(name, true);
- try
+ NodeSPI n = cache.peek(name, false);
+ if (n == null)
{
- NodeSPI n = cache.peek(name, false);
- if (n == null)
- {
- MethodCall call = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, name, key, true);
- return callRemote(call);
- }
- else
- {
- // dont bother with a remote call
- return n.getDirect(key);
- }
+ MethodCall call = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, name, key, true);
+ return callRemote(call);
}
- finally
+ else
{
- lock.releaseLock(name);
+ // dont bother with a remote call
+ return n.getDirect(key);
}
}
- else
+ finally
{
- log.trace("Call originated remotely. Not bothering to try and do a clustered get() for this put(). Returning null.");
- return null;
+ lock.releaseLock(name);
}
}
@@ -228,32 +234,26 @@
*/
public Object remove(Fqn name, Object key) throws Exception
{
- if (cache.getInvocationContext().isOriginLocal())
+ // DON'T make a remote call if this is a remote call in the first place - leads to deadlocks - JBCACHE-1103
+ if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return false;
+ lock.acquireLock(name, true);
+ try
{
- lock.acquireLock(name, true);
- try
+ NodeSPI n = cache.peek(name, true);
+ if (n == null)
{
- NodeSPI n = cache.peek(name, true);
- if (n == null)
- {
- MethodCall call = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, name, key, true);
- return callRemote(call);
- }
- else
- {
- // dont bother with a remote call
- return n.getDirect(key);
- }
+ MethodCall call = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, name, key, true);
+ return callRemote(call);
}
- finally
+ else
{
- lock.releaseLock(name);
+ // dont bother with a remote call
+ return n.getDirect(key);
}
}
- else
+ finally
{
- log.trace("Call originated remotely. Not bothering to try and do a clustered get() for this remove(). Returning null.");
- return null;
+ lock.releaseLock(name);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java 2008-01-03 12:42:32 UTC (rev 4965)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java 2008-01-03 13:20:31 UTC (rev 4966)
@@ -1,5 +1,8 @@
package org.jboss.cache.loader;
+import org.testng.annotations.Test;
+
+@Test(groups = {"functional"})
public class ClusteredCacheLoaderRegionBasedTest extends ClusteredCacheLoaderTest
{
public ClusteredCacheLoaderRegionBasedTest()
16 years, 11 months
JBoss Cache SVN: r4965 - core/trunk/src/test/java/org/jboss/cache/eviction/minttl.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-01-03 07:42:32 -0500 (Thu, 03 Jan 2008)
New Revision: 4965
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
Log:
increased sleep time to wait for eviction thread
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-01-03 10:32:35 UTC (rev 4964)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2008-01-03 12:42:32 UTC (rev 4965)
@@ -98,7 +98,7 @@
// the last cache.get() would have updated the last modified tstamp so we need to wait at least 3 secs (+1 sec maybe for the eviction thread)
// to make sure this is evicted.
- TestingUtil.sleepThread(4500);
+ TestingUtil.sleepThread(5000);
assert cache.get(fqn, "k") == null : "Node should have been evicted";
}
16 years, 11 months
JBoss Cache SVN: r4964 - in cache-bench-fwk/trunk: src/org/cachebench and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 05:32:35 -0500 (Thu, 03 Jan 2008)
New Revision: 4964
Modified:
cache-bench-fwk/trunk/conf/cachebench.xml
cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java
cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java
cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerator.java
cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
enhanced logging
Modified: cache-bench-fwk/trunk/conf/cachebench.xml
===================================================================
--- cache-bench-fwk/trunk/conf/cachebench.xml 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/conf/cachebench.xml 2008-01-03 10:32:35 UTC (rev 4964)
@@ -21,8 +21,8 @@
-->
<cluster bindAddress="127.0.0.1">
<member host="127.0.0.1" port="7800"/>
- <member host="127.0.0.1" port="7801"/>
- <member host="127.0.0.1" port="7802"/>
+ <!--<member host="127.0.0.1" port="7801"/>-->
+ <!--<member host="127.0.0.1" port="7802"/>-->
</cluster>
<!-- Each testcase represents either a single configuration or a cacheing product.
@@ -92,8 +92,8 @@
See javadocs for org.cachebench.reportgenerators.ReportGenerator for writing your
own report generators such as XML generators, graphic generators, etc
-->
- <!-- The CSV report generated can be plugged in to a spreadsheet to generate graphs, cluster size is
- needed so that the . -->
- <report outputFile="performance.csv" generator="org.cachebench.reportgenerators.ClusterReportGenerator"/>
+ <!-- The CSV report generated can be plugged in to a spreadsheet to generate graphs. If 'outputFile is set to
+ '-generic-' then the name would be generated as follows: 'performance-<clusterSize>.csv' -->
+ <report outputFile="-generic-" generator="org.cachebench.reportgenerators.ClusterReportGenerator"/>
</cachebench>
Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 10:32:35 UTC (rev 4964)
@@ -238,8 +238,8 @@
{
generator.setConfigParams(report.getParams());
generator.setResults(results);
- generator.setOutputFile(new File(report.getOutputFile()));
generator.setClusterConfig(conf.getClusterConfig());
+ generator.setOutputFile(report.getOutputFile());
generator.generate();
logger.info("Report Generation Completed");
}
Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-03 10:32:35 UTC (rev 4964)
@@ -17,11 +17,20 @@
protected Log log;
protected ClusterConfig clusterConfig;
- public void setOutputFile(File output)
+ public void setOutputFile(String fileName)
{
- this.output = output;
+ this.output = new File(getFileName(fileName));
}
+ private String getFileName(String fileName)
+ {
+ if (fileName.indexOf("-generic-") >=0 )
+ {
+ return "performance-" + clusterConfig.getClusterSize() + ".csv";
+ }
+ return fileName;
+ }
+
public void setResults(List<TestResult> results)
{
this.results = results;
Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-03 10:32:35 UTC (rev 4964)
@@ -65,7 +65,7 @@
{
CSVReportGenerator generator = new CSVReportGenerator();
generator.setResults(mergedResults);
- generator.setOutputFile(output);
+ generator.output = output;
generator.generate();
}
Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerator.java 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerator.java 2008-01-03 10:32:35 UTC (rev 4964)
@@ -16,7 +16,7 @@
{
public void setConfigParams(Map<String, String> configParams);
- public void setOutputFile(File output);
+ public void setOutputFile(String fileName);
public void setResults(List<TestResult> results);
Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java 2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java 2008-01-03 10:32:35 UTC (rev 4964)
@@ -39,8 +39,17 @@
cache.put(PREFIX + currentNodeIndex, "true");
Thread.sleep(2000);//just to make sure that prev barrier closed its sockets etc
+ if (conf.getClusterConfig().getClusterSize() == 1)
+ {
+ log.info("Cluster size is one, no replication expected");
+ TestResult result = new TestResult();
+ result.setTestPassed(true);
+ result.setSkipReport(true);
+ return result;
+ }
+
boolean allNodesReplicated = nodesReplicated(cache, testCaseName, testName);
-
+
Map<SocketAddress, Object> receivedValues = broadcastReplicationResult(allNodesReplicated);
cache.empty();
return allReplicatedFine(receivedValues);
@@ -52,7 +61,7 @@
ClusterBarrier barrier = new ClusterBarrier();
barrier.setConfig(conf.getClusterConfig());
barrier.barrier(String.valueOf(allNodesReplicated));
- Map<SocketAddress,Object> receivedValues = barrier.getReceivedMessages();
+ Map<SocketAddress, Object> receivedValues = barrier.getReceivedMessages();
log.info("Recieved following responses from barrier:" + receivedValues);
return receivedValues;
}
@@ -70,7 +79,7 @@
{
TestResult result = new TestResult();
result.setSkipReport(true);
- for (Object value: receivedValues.values())
+ for (Object value : receivedValues.values())
{
if (!"true".equals(value))
{
16 years, 11 months
JBoss Cache SVN: r4963 - in cache-bench-fwk/trunk/src/org/cachebench: config and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 05:02:41 -0500 (Thu, 03 Jan 2008)
New Revision: 4963
Modified:
cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java
cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java
Log:
enhanced logging
Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 10:02:41 UTC (rev 4963)
@@ -137,11 +137,13 @@
private void warmupCache(TestCase test, CacheWrapper cache) throws Exception
{
+ logger.info("Warming up..");
CacheWarmupConfig warmupConfig = test.getCacheWarmupConfig();
logger.trace("Warmup config is: " + warmupConfig);
CacheWarmup warmup = (CacheWarmup) Instantiator.getInstance().createClass(warmupConfig.getWarmupClass());
warmup.setConfigParams(warmupConfig.getParams());
warmup.warmup(cache);
+ logger.info("Warmup ended!");
}
/**
Modified: cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java 2008-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java 2008-01-03 10:02:41 UTC (rev 4963)
@@ -9,7 +9,7 @@
private String name;
private String cacheWrapper;
- private boolean stopOnFailure;
+ private boolean stopOnFailure = true;
private List<TestConfig> tests = new ArrayList<TestConfig>();
Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java 2008-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java 2008-01-03 10:02:41 UTC (rev 4963)
@@ -41,7 +41,7 @@
result.setTestTime(new Date());
result.setTestType(testName);
- log.info("Performing PUTs");
+ log.info("Performing '" + sampleSize + "' PUTs");
DescriptiveStatistics putStats = doPuts(cache, valueClass, sampleSize);
executor = Executors.newFixedThreadPool(numThreads);
log.info("Performing GETs");
Modified: cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java 2008-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java 2008-01-03 10:02:41 UTC (rev 4963)
@@ -17,7 +17,7 @@
public void performWarmupOperations(CacheWrapper wrapper) throws Exception
{
Integer opCount = Integer.parseInt(getConfigParam("operationCount"));
- log.trace("Cache launched, performing " + opCount + " put and get operations ");
+ log.info("Cache launched, performing " + opCount + " put and get operations ");
for (int i = 0; i < opCount; i++)
{
wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
16 years, 11 months
JBoss Cache SVN: r4962 - cache-bench-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 04:46:10 -0500 (Thu, 03 Jan 2008)
New Revision: 4962
Modified:
cache-bench-fwk/trunk/runNode.sh
Log:
added preferIpV4 ...
Modified: cache-bench-fwk/trunk/runNode.sh
===================================================================
--- cache-bench-fwk/trunk/runNode.sh 2008-01-03 09:37:07 UTC (rev 4961)
+++ cache-bench-fwk/trunk/runNode.sh 2008-01-03 09:46:10 UTC (rev 4962)
@@ -4,6 +4,7 @@
# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
CACHE_DEBUG=true
+preferIPv4Stack=true
if [ -z $1 ]
then
@@ -16,7 +17,7 @@
exit 0
fi
-export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG "
+export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG -Djava.net.preferIPv4Stack=$preferIPv4Stack"
#libraries needed by the fwk, add them to the classpath
for JAR in ./lib/*
16 years, 11 months
JBoss Cache SVN: r4961 - in cache-bench-fwk/trunk: src/org/cachebench and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 04:37:07 -0500 (Thu, 03 Jan 2008)
New Revision: 4961
Modified:
cache-bench-fwk/trunk/runNode.sh
cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
Log:
logging enhanced and bsh chanages
Modified: cache-bench-fwk/trunk/runNode.sh
===================================================================
--- cache-bench-fwk/trunk/runNode.sh 2008-01-03 09:26:18 UTC (rev 4960)
+++ cache-bench-fwk/trunk/runNode.sh 2008-01-03 09:37:07 UTC (rev 4961)
@@ -4,7 +4,6 @@
# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
CACHE_DEBUG=true
-preferIPv4Stack=true
if [ -z $1 ]
then
@@ -17,7 +16,7 @@
exit 0
fi
-export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG -Djava.net.preferIPv4Stack=$preferIPv4Stack"
+export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG "
#libraries needed by the fwk, add them to the classpath
for JAR in ./lib/*
Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 09:26:18 UTC (rev 4960)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-03 09:37:07 UTC (rev 4961)
@@ -131,7 +131,8 @@
barrier.setConfig(conf.getClusterConfig());
barrier.setAcknowledge(true);
barrier.barrier(messageName);
- logger.trace("Barrier finished");
+ logger.info("Barrier for '" + messageName + "' finished");
+
}
private void warmupCache(TestCase test, CacheWrapper cache) throws Exception
16 years, 11 months
JBoss Cache SVN: r4960 - cache-bench-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 04:26:18 -0500 (Thu, 03 Jan 2008)
New Revision: 4960
Modified:
cache-bench-fwk/trunk/runNode.sh
Log:
updated log config
Modified: cache-bench-fwk/trunk/runNode.sh
===================================================================
--- cache-bench-fwk/trunk/runNode.sh 2008-01-03 08:19:09 UTC (rev 4959)
+++ cache-bench-fwk/trunk/runNode.sh 2008-01-03 09:26:18 UTC (rev 4960)
@@ -1,25 +1,23 @@
#!/bin/bash
# author: Mircea.Markus(a)jboss.com
-# cygwin users: add the scripts from :pserver:anoncvs@cygwin.com:/cvs/cygwin-apps/wrappers/java to the cygwin_home/usr/local/bin
+# cygwin users: add the scripts from :pserver:anoncvs@cygwin.com:/cvs/cygwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp
-BIND_ADDRESS=127.0.0.1
CACHE_DEBUG=true
preferIPv4Stack=true
if [ -z $1 ]
then
echo "Usage:"
- echo " ./runNode.sh currentNodeIndex testConfig [other params]"
- echo "currentNodeIndex : the index of this node in the list of nodes in the cluster, zero based"
- echo "testConfig : must be on of the directories form cache products"
- echo "other params : this will be passed as argument to the cache benchmark class."
- echo " Might be used, for e.g. to pass -D arguments to the custom plugins"
- echo " configured in cachebench.xml"
+ echo " ./runNode.sh currentNodeIndex testConfig otherSysProps customConfigFile"
+ echo "currentNodeIndex : the index of this node in the list of nodes in the cluster(0..n)"
+ echo "testConfig : must be one of the directories names under 'cache-products'"
+ echo "other params : should be used to pass -D arguments to the custom plugins. e.g. JBossCache might need an 'bindAddress' argument"
+ echo "customConfigFile : the path to the a custom 'cachebenchmark.xml' (other than the one in 'conf' dir which is loaded by default)"
exit 0
fi
-export SYS_PROPS="-Dbind.address=$BIND_ADDRESS -DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG -Djava.net.preferIPv4Stack=$preferIPv4Stack"
+export SYS_PROPS="-DcurrentIndex=$1 -Dorg.cachebench.debug=$CACHE_DEBUG -Djava.net.preferIPv4Stack=$preferIPv4Stack"
#libraries needed by the fwk, add them to the classpath
for JAR in ./lib/*
@@ -49,6 +47,6 @@
else
TO_EXECUTE="java -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchmarkRunner $3"
echo executing $TO_EXECUTE
- java -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchmarkRunner $3
+ java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4
fi
16 years, 11 months
JBoss Cache SVN: r4959 - cache-bench-fwk/trunk/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 03:19:09 -0500 (Thu, 03 Jan 2008)
New Revision: 4959
Modified:
cache-bench-fwk/trunk/conf/log4j.xml
Log:
updated log config
Modified: cache-bench-fwk/trunk/conf/log4j.xml
===================================================================
--- cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 08:14:38 UTC (rev 4958)
+++ cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 08:19:09 UTC (rev 4959)
@@ -67,7 +67,7 @@
<priority value="ERROR"/>
<appender-ref ref="FILE"/>
</category>
-
+
<category name="org.jboss.cache" additivity="false">
<priority value="WARN"/>
<appender-ref ref="FILE"/>
16 years, 11 months
JBoss Cache SVN: r4958 - cache-bench-fwk/trunk/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 03:14:38 -0500 (Thu, 03 Jan 2008)
New Revision: 4958
Modified:
cache-bench-fwk/trunk/conf/log4j.xml
Log:
removed other onfig files as they are utdated
Modified: cache-bench-fwk/trunk/conf/log4j.xml
===================================================================
--- cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 07:48:53 UTC (rev 4957)
+++ cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 08:14:38 UTC (rev 4958)
@@ -68,7 +68,7 @@
<appender-ref ref="FILE"/>
</category>
- <category name="org.jboss.cache">
+ <category name="org.jboss.cache" additivity="false">
<priority value="WARN"/>
<appender-ref ref="FILE"/>
<appender-ref ref="CONSOLE"/>
16 years, 11 months
JBoss Cache SVN: r4957 - cache-bench-fwk/trunk/conf.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-01-03 02:48:53 -0500 (Thu, 03 Jan 2008)
New Revision: 4957
Modified:
cache-bench-fwk/trunk/conf/log4j.xml
Log:
removed other onfig files as they are utdated
Modified: cache-bench-fwk/trunk/conf/log4j.xml
===================================================================
--- cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 07:17:38 UTC (rev 4956)
+++ cache-bench-fwk/trunk/conf/log4j.xml 2008-01-03 07:48:53 UTC (rev 4957)
@@ -43,22 +43,11 @@
</category>
<category name="org.cachebench" additivity="false">
- <priority value="DEBUG"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- </category>
-
- <category name="org.cachebench.cluster" additivity="false">
<priority value="INFO"/>
<appender-ref ref="FILE"/>
<appender-ref ref="CONSOLE"/>
</category>
- <category name="org.cachebench.tests" additivity="false">
- <priority value="INFO"/>
- <appender-ref ref="CONSOLE"/>
- </category>
-
<category name="net.sf.ehcache" additivity="false">
<priority value="DEBUG"/>
<appender-ref ref="FILE"/>
@@ -79,11 +68,6 @@
<appender-ref ref="FILE"/>
</category>
- <category name="org.cachebench.tests.ReplicationOccursTest" additivity="false">
- <priority value="TRACE"/>
- <appender-ref ref="CONSOLE"/>
- </category>
-
<category name="org.jboss.cache">
<priority value="WARN"/>
<appender-ref ref="FILE"/>
16 years, 11 months