April 2009 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r8032 - in benchmarks/benchmark-fwk/branches/mavenized: framework/src/main and 1 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:54:55 -0400 (Thu, 30 Apr 2009) New Revision: 8032 Added: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/resources/conf/ Removed: benchmarks/benchmark-fwk/branches/mavenized/build.properties benchmarks/benchmark-fwk/branches/mavenized/build.xml benchmarks/benchmark-fwk/branches/mavenized/conf/ Log: Deleted: benchmarks/benchmark-fwk/branches/mavenized/build.properties =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/build.properties 2009-04-30 11:53:17 UTC (rev 8031) +++ benchmarks/benchmark-fwk/branches/mavenized/build.properties 2009-04-30 11:54:55 UTC (rev 8032) @@ -1,10 +0,0 @@ -## Used when performing either runMaster or runSlave targets on the build script. -jvm.fork=true -jvm.maxmem=1024M - -bind.address=127.0.0.1 -java.net.preferIPv4Stack=true -org.cachebench.debug=false -tangosol.coherence.localhost=127.0.0.1 - - Deleted: benchmarks/benchmark-fwk/branches/mavenized/build.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/build.xml 2009-04-30 11:53:17 UTC (rev 8031) +++ benchmarks/benchmark-fwk/branches/mavenized/build.xml 2009-04-30 11:54:55 UTC (rev 8032) @@ -1,296 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="cachebenchfwk" default="help" basedir="."> - - - <property file="build.properties"/> -  -  - -  - - <property name="compiler.debug" value="on"/> - <property name="compiler.generate.no.warnings" value="off"/> - - <property environment="env"/> - - <property name="framework.output.dir" value="./classes/production/Framework"/> - <condition property="coherence.jars.present"> - <and> - <available file="cache-products/coherence-3.3.1/lib/coherence.jar"/> - <available file="cache-products/coherence-3.3.1/lib/tangosol.jar"/> - </and> - </condition> - - - <path id="framework.module.classpath"> - <fileset dir="./lib" includes="**/*.jar"/> - <pathelement location="./conf"/> - </path> - - - <target name="help" description="Dumps usage information"> - <echo> - This script has the purpose of building the CacheBenchFwk. - See /docs/ for more details. - - Some useful targets: - - help - this documentation - all - builds the entire project, including plugins for all - cache products in /cache-products/. Output classes - in /classes/. - runNode - runs the CacheBenchFwk. Depending on the number of nodes in the cluster(configured in - cachebenchmark.xml), - it will wait for all configured nodes to be launched before starting the tests - - Make sure you have looked at: - - 1) 'build.properties' and have set JVM params (such as heap size, - etc.) as necessary. - 2) '/conf/cachebench.xml' to configure the tests you want run, the - nodes in the cluster if the case and the output file for reports. - 3) '/conf/log4j.xml' for logging settings (make sure these aren't - very verbose as it can skew tests). - 4) Provided one of the plugins as a system property. This is - necessary since at the moment plugin libs may overlap and - cause problems, so are not loaded every time. Specify which - plugin you plan to use in your test by using - - -Dorg.cachebench.plugins.jbosscache1=true -Dbind.address=${MYTESTIP_1} - -Dorg.cachebench.plugins.jbosscache2=true -Dbind.address=${MYTESTIP_1} - -Dorg.cachebench.plugins.ehcache=true -Dbind.address=${MYTESTIP_1} - -Dorg.cachebench.plugins.coherence=true -Dtangosol.coherence.localhost=${MYTESTIP_1} - // WORK IN PROGRESS - -Dorg.cachebench.plugins.terracotta=true - when running ant. Note that only one can be set at any time. - 5) Make sure you set up an correct NODE_INDEX environment property - indicating the index of the node before starting it. E.g. if - we have 3 nodes each process should have an environment - variable named NODE_INDEX, having values in the range 0-2, - each node having an distict value. - see cachebench.xml\cachebench\cluster for more details - - NB: NEEDS Ant >= 1.7.0 - </echo> - </target> - - - <target name="fwk" description="Compile module Framework"> - <mkdir dir="${framework.output.dir}"/> - <javac destdir="${framework.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" - fork="true"> - <classpath refid="framework.module.classpath"/> - <src path="./src"/> - </javac> - </target> - - <target name="compile.module.ehcache150" depends="fwk" - description="Compile module ehcache-1.5.0; production classes"> - <mkdir dir="./classes/production/ehcache-1.5.0"/> - <javac destdir="./classes/production/ehcache-1.5.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/ehcache-1.5.0/lib" includes="*.jar"/> - <fileset dir="./lib/common" includes="*.jar"/> - <pathelement location="./cache-products/ehcache-1.5.0/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="./classes/production/ehcache-1.5.0"/> - </classpath> - <src path="./cache-products/ehcache-1.5.0/src"/> - </javac> - </target> - - <target name="compile.module.ehcache160" depends="fwk" - description="Compile module ehcache-1.6.0; production classes"> - <mkdir dir="./classes/production/ehcache-1.6.0"/> - <javac destdir="./classes/production/ehcache-1.6.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/ehcache-1.6.0/lib" includes="*.jar"/> - <fileset dir="./lib/common" includes="*.jar"/> - <pathelement location="./cache-products/ehcache-1.6.0/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="./classes/production/ehcache-1.6.0"/> - </classpath> - <src path="./cache-products/ehcache-1.6.0/src"/> - </javac> - </target> - - <target name="compile.module.coherence331" depends="fwk" - description="Compile module coherence331; production classes" if="coherence.jars.present"> - <mkdir dir="./classes/production/coherence-3.3.1"/> - <javac destdir="./classes/production/coherence-3.3.1" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/coherence-3.3.1/lib" includes="*.jar"/> - <pathelement location="./cache-products/coherence-3.3.1/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="./classes/production/coherence-3.3.1"/> - </classpath> - <src path="./cache-products/coherence-3.3.1"/> - </javac> - </target> - - <target name="compile.module.terracotta250" depends="fwk" - description="Compile module terracotta-2.5.0; production classes"> - <mkdir dir="./classes/production/terracotta-2.5.0"/> - <javac destdir="./classes/production/terracotta-2.5.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <pathelement location="./cache-products/terracotta-2.5.0/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="./classes/production/terracotta-2.5.0"/> - </classpath> - <src path="./cache-products/terracotta-2.5.0/src"/> - </javac> - </target> - - <target name="compile.module.jbosscache140" depends="fwk" - description="Compile module jbosscache-1.4.1; production classes"> - <mkdir dir="./classes/production/jbosscache-1.4.1"/> - <javac destdir="./classes/production/jbosscache-1.4.1" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/jbosscache-1.4.1/lib" includes="**/*.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src> - <dirset dir="./cache-products/jbosscache-1.4.1"> - <include name="src"/> - </dirset> - </src> - </javac> - </target> - - <target name="compile.module.jbosscache200" depends="fwk" - description="Compile module jbosscache-2.0.0"> - <mkdir dir="./classes/production/jbosscache-2.0.0"/> - <javac destdir="./classes/production/jbosscache-2.0.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/jbosscache-2.0.0/lib" includes="*.jar"/> - <pathelement location="./lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/jbosscache-2.0.0/src"/> - </javac> - </target> - - <target name="compile.module.jbosscache210" depends="fwk" - description="Compile module jbosscache-2.1.0cr2; production classes"> - <mkdir dir="./classes/production/jbosscache-2.1.0"/> - <javac destdir="./classes/production/jbosscache-2.1.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/jbosscache-2.1.0/lib" includes="*.jar"/> - <pathelement location="./lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/jbosscache-2.1.0/src"/> - </javac> - </target> - - <target name="compile.module.jbosscache220" depends="fwk" - description="Compile module jbosscache-2.2.0; production classes"> - <mkdir dir="./classes/production/jbosscache-2.2.0"/> - <javac destdir="./classes/production/jbosscache-2.2.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/jbosscache-2.2.0/lib" includes="*.jar"/> - <pathelement location="./lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/jbosscache-2.2.0/src"/> - </javac> - </target> - - <target name="compile.module.pojocache220" depends="fwk" - description="Compile module pojocache-2.2.0; production classes"> - <mkdir dir="./classes/production/pojocache-2.2.0"/> - <javac destdir="./classes/production/pojocache-2.2.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/pojocache-2.2.0/lib" includes="*.jar"/> - <pathelement location="./lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/pojocache-2.2.0/src"/> - </javac> - </target> - - <target name="compile.module.whirlycache101" depends="fwk" - description="Compile module whirlycache-1.0.1; production classes"> - <mkdir dir="./classes/production/whirlycache-1.0.1"/> - <javac destdir="./classes/production/whirlycache-1.0.1" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/whirlycache-1.0.1/lib" includes="**/*.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/whirlycache-1.0.1/src"/> - </javac> - </target> - - <target name="compile.module.jbosscache300" depends="fwk" - description="Compile module jbosscache-3.0.0"> - <mkdir dir="./classes/production/jbosscache-3.0.0"/> - <javac destdir="./classes/production/jbosscache-3.0.0" debug="${compiler.debug}" - 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> - <src path="./cache-products/jbosscache-3.0.0/src"/> - </javac> - </target> - - <target name="compile.module.infinispan400" depends="fwk" - description="Compile module infinispan-4.0.0"> - <mkdir dir="./classes/production/infinispan-4.0.0"/> - <javac destdir="./classes/production/infinispan-4.0.0" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" fork="true"> - <classpath> - <fileset dir="./cache-products/infinispan-4.0.0/lib" includes="*.jar"/> - <fileset dir="./lib/common" includes="*.jar"/> - <pathelement location="./lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - </classpath> - <src path="./cache-products/infinispan-4.0.0/src"/> - </javac> - </target> - - <target name="clean" description="cleanup all"> - <delete dir="./classes"/> - </target> - - <target name="all" - depends="clean, fwk, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.pojocache220, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache150, compile.module.ehcache160, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331, compile.module.infinispan400" - description="build all"/> - - <target name="checkClusterAddresses" depends="fwk" - description="Check whether the cluster config is a valid one"> - <java classname="org.cachebench.ClusterConfigurationCheck" clonevm="true" fork="true"> - <classpath> - <pathelement location="${framework.output.dir}"/> - </classpath> - <classpath refid="framework.module.classpath"/> - </java> - </target> - - <target name="deploy.sf" depends="fwk" description="builds the smartfrog jar and deploys it"> - <rmic classname="org.cachebench.smartfrog.CacheBenchmarkPrim" base="${framework.output.dir}" verify="true" - debug="true"> - <classpath refid="framework.module.classpath"/> - </rmic> - <delete dir="${basedir}/smartfrog/sfClasses"/> - <mkdir dir="${basedir}/smartfrog/sfClasses"/> - <jar destfile="${basedir}/smartfrog/sfClasses/cacheBenchmark-sf.jar"> - <fileset dir="${framework.output.dir}" includes="**/smartfrog/**"/> -  - </jar> - </target> -</project> Copied: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/conf)

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8031 - in benchmarks/benchmark-fwk/branches/mavenized: caches/coherence34/src/main/java and 6 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:53:17 -0400 (Thu, 30 Apr 2009) New Revision: 8031 Added: benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/README.txt benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/conf/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/resources/conf/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/resources/conf/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/resources/conf/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/resources/conf/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/resources/conf/ Removed: benchmarks/benchmark-fwk/branches/mavenized/cache-products/ Log: Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/java/org (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/coherence-3.3.1/src/org) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/README.txt (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/coherence-3.3.1/README.txt) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/README.txt (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/README.txt 2009-04-30 11:53:17 UTC (rev 8031) @@ -0,0 +1,7 @@ +Due to licensing restrictions, Coherence JARs cannot be distributed with this benchmark framework. To enable benchmarking +Coherence, download the Coherence JAR files from Oracle's website: + + http://www.oracle.com/technology/software/products/ias/htdocs/coherence.html + +Put the JAR files in the lib/ directory, and then re-run "ant clean all" from the benchmark's root directory to build +and enable Coherence benchmarking. Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/coherence-3.3.1/conf) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.5.0/conf) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/conf) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.1.0/conf) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.2.0/conf) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/resources/conf (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-3.0.0/conf)

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8030 - in core/trunk/src: main/java/org/jboss/cache/commands/remote and 4 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:38:24 -0400 (Thu, 30 Apr 2009) New Revision: 8030 Added: core/trunk/src/test/java/org/jboss/cache/loader/ChainedClusteredCacheLoaderTest.java Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java Log: [JBCACHE-1508] ( ClusteredGetCommand bypasses loading from other cache loaders on remote instance) plus fixed some additional failing tests Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -64,6 +64,7 @@ // defaults to true. private boolean originLocal = true; private boolean localRollbackOnly; + private boolean bypassUnmarshalling = false; @Deprecated private MethodCall methodCall; @Deprecated @@ -423,6 +424,7 @@ methodCall = null; command = null; fqnsLoaded = null; + bypassUnmarshalling = false; } /** @@ -577,6 +579,7 @@ copy.transaction = transaction; copy.transactionContext = transactionContext; copy.fqnsLoaded = fqnsLoaded; + copy.bypassUnmarshalling = bypassUnmarshalling; } /** @@ -612,6 +615,7 @@ ", transactionContext=" + transactionContext + ", optionOverrides=" + optionOverrides + ", originLocal=" + originLocal + + ", bypassUnmarshalling=" + bypassUnmarshalling + '}'; } @@ -624,6 +628,7 @@ final InvocationContext that = (InvocationContext) o; if (localRollbackOnly != that.localRollbackOnly) return false; + if (bypassUnmarshalling != that.bypassUnmarshalling) return false; if (originLocal != that.originLocal) return false; if (globalTransaction != null ? !globalTransaction.equals(that.globalTransaction) : that.globalTransaction != null) { @@ -647,6 +652,17 @@ result = 29 * result + (optionOverrides != null ? optionOverrides.hashCode() : 0); result = 29 * result + (originLocal ? 1 : 0); result = 29 * result + (localRollbackOnly ? 1 : 0); + result = 29 * result + (bypassUnmarshalling ? 1 : 0); return result; } + + public void setBypassUnmarshalling(boolean b) + { + this.bypassUnmarshalling = b; + } + + public boolean isBypassUnmarshalling() + { + return bypassUnmarshalling; + } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -31,10 +31,12 @@ import org.jboss.cache.commands.read.GetChildrenNamesCommand; import org.jboss.cache.commands.read.GetDataMapCommand; import org.jboss.cache.interceptors.InterceptorChain; +import org.jboss.cache.loader.CacheLoaderManager; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Issues a clustered get call, for use primarily by the {@link org.jboss.cache.loader.ClusteredCacheLoader}. This is @@ -53,6 +55,7 @@ private boolean searchBackupSubtrees; private DataContainer dataContainer; private InterceptorChain interceptorChain; + private CacheLoaderManager clm; private static final Log log = LogFactory.getLog(ClusteredGetCommand.class); private static final boolean trace = log.isTraceEnabled(); @@ -90,8 +93,11 @@ if (trace) log.trace("Clustered get: invoking call with Fqn " + dataCommand.getFqn()); InvocationContext ctx = interceptorChain.getInvocationContext(); ctx.setOriginLocal(false); - // very hacky to be calling this command directly. - callResults = dataCommand.perform(ctx); + ctx.setBypassUnmarshalling(true); + callResults = interceptorChain.invoke(ctx, dataCommand); + Set mapCallRes; + if (dataCommand instanceof GetChildrenNamesCommand && (mapCallRes = (Set) callResults) != null && mapCallRes.isEmpty()) + callResults = null; boolean found = validResult(callResults); if (trace) log.trace("Got result " + callResults + ", found=" + found); if (found && callResults == null) callResults = createEmptyResults(); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -69,7 +69,7 @@ Set<MarshalledValue> marshalledValues = new HashSet<MarshalledValue>(); command.setData(wrapMap(command.getData(), marshalledValues, ctx)); Object retVal = invokeNextInterceptor(ctx, command); - return compactAndProcessRetVal(marshalledValues, retVal); + return ctx.isBypassUnmarshalling() ? retVal : compactAndProcessRetVal(marshalledValues, retVal); } @Override @@ -80,7 +80,7 @@ { if (trace) log.trace("Return value is a Map and we're retrieving data. Wrapping as a MarshalledValueMap."); Map retValMap = (Map) retVal; - if (!retValMap.isEmpty()) retVal = new MarshalledValueMap(retValMap); + if (!ctx.isBypassUnmarshalling() && !retValMap.isEmpty()) retVal = new MarshalledValueMap(retValMap); } return retVal; } @@ -106,21 +106,21 @@ command.setValue(value); } Object retVal = invokeNextInterceptor(ctx, command); - return compactAndProcessRetVal(marshalledValues, retVal); + return ctx.isBypassUnmarshalling() ? retVal : compactAndProcessRetVal(marshalledValues, retVal); } @Override public Object visitGetNodeCommand(InvocationContext ctx, GetNodeCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); - return processRetVal(retVal); + return ctx.isBypassUnmarshalling() ? retVal : processRetVal(retVal); } @Override public Object visitClearDataCommand(InvocationContext ctx, ClearDataCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); - return processRetVal(retVal); + return ctx.isBypassUnmarshalling() ? retVal : processRetVal(retVal); } @Override @@ -133,21 +133,21 @@ command.setKey(value); } Object retVal = invokeNextInterceptor(ctx, command); - return compactAndProcessRetVal(marshalledValues, retVal); + return ctx.isBypassUnmarshalling() ? retVal : compactAndProcessRetVal(marshalledValues, retVal); } @Override public Object visitGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); - return processRetVal(retVal); + return ctx.isBypassUnmarshalling() ? retVal : processRetVal(retVal); } @Override public Object visitGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); - return processRetVal(retVal); + return ctx.isBypassUnmarshalling() ? retVal : processRetVal(retVal); } @Override @@ -160,7 +160,7 @@ command.setKey(value); } Object retVal = invokeNextInterceptor(ctx, command); - return compactAndProcessRetVal(marshalledValues, retVal); + return ctx.isBypassUnmarshalling() ? retVal : compactAndProcessRetVal(marshalledValues, retVal); } private Object compactAndProcessRetVal(Set<MarshalledValue> marshalledValues, Object retVal) Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -185,7 +185,9 @@ 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 (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) return Collections.emptyMap(); + if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()) + return null; +// return Collections.emptyMap(); lock.acquireLock(name, true); try { Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -387,7 +387,7 @@ { for (Cache cache : caches) { - if (cache != null) assertEquals(cache.getLocalAddress() + " still holds locks",0, ((CacheSPI) cache).getNumberOfLocksHeld()); + if (cache != null) assert ((CacheSPI) cache).getNumberOfLocksHeld() < 1 : cache.getLocalAddress() + " still holds locks"; } } Added: core/trunk/src/test/java/org/jboss/cache/loader/ChainedClusteredCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ChainedClusteredCacheLoaderTest.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/loader/ChainedClusteredCacheLoaderTest.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -0,0 +1,103 @@ +package org.jboss.cache.loader; + +import org.jboss.cache.AbstractMultipleCachesTest; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.factories.UnitTestConfigurationFactory; +import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; +import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoaderConfig; +import org.testng.annotations.Test; + +import java.util.HashSet; +import java.util.Set; + +@Test(groups = {"functional"}, sequential = true, testName = "loader.ChainedClusteredCacheLoaderTest") +public class ChainedClusteredCacheLoaderTest extends AbstractMultipleCachesTest +{ + private CacheSPI<Object, Object> cache1, cache2; + private CacheLoader loader1, loader2; + private Fqn fqn = Fqn.fromString("/a"); + private Fqn fqn2 = Fqn.fromString("/a/b"); + private String key = "key"; + + protected void createCaches() throws Throwable { + Configuration c1 = new Configuration(); + Configuration c2 = new Configuration(); + c1.setStateRetrievalTimeout(2000); + c2.setStateRetrievalTimeout(2000); + c1.setCacheMode(Configuration.CacheMode.REPL_SYNC); + c2.setCacheMode(Configuration.CacheMode.REPL_SYNC); + + c1.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", + "timeout=5000", false, false, false, false, false)); + c2.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", + "timeout=5000", false, false, false, false, false)); + DummySharedInMemoryCacheLoaderConfig cfg = new DummySharedInMemoryCacheLoaderConfig("cache-2"); + c2.getCacheLoaderConfig().addIndividualCacheLoaderConfig(cfg); + + c1.setUseRegionBasedMarshalling(false); + c2.setUseRegionBasedMarshalling(false); + + + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c1, false, getClass()); + cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c2, false, getClass()); + cache1.getConfiguration().setSerializationExecutorPoolSize(0); + cache2.getConfiguration().setSerializationExecutorPoolSize(0); + + + cache1.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); + cache2.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); + + cache1.start(); + cache2.start(); + + loader1 = cache1.getCacheLoaderManager().getCacheLoader(); + loader2 = cache2.getCacheLoaderManager().getCacheLoader(); + registerCaches(cache1, cache2); + } + + public void testClusteredGetFromSecondLoader() throws Exception { + cache1.put(fqn, key, "value"); + + assert loader1 instanceof ClusteredCacheLoader; + assert loader2 instanceof ChainingCacheLoader; + DummySharedInMemoryCacheLoader dummyLoader2 = (DummySharedInMemoryCacheLoader) ((ChainingCacheLoader) loader2).getCacheLoaders().get(1); + + assert loader1.get(fqn).containsKey(key); + assert loader2.get(fqn).containsKey(key); + assert dummyLoader2.get(fqn).containsKey(key); + + // evict from memory on all caches + cache1.evict(fqn); + cache2.evict(fqn); + + assert dummyLoader2.get(fqn).containsKey(key); + + assert "value".equals(cache1.get(fqn, key)); + } + + public void testClusteredGetChildrenNamesFromSecondLoader() throws Exception { + cache1.put(fqn, key, "value"); + cache1.put(fqn2, key, "value"); + + assert loader1 instanceof ClusteredCacheLoader; + assert loader2 instanceof ChainingCacheLoader; + DummySharedInMemoryCacheLoader dummyLoader2 = (DummySharedInMemoryCacheLoader) ((ChainingCacheLoader) loader2).getCacheLoaders().get(1); + + assert loader1.get(fqn).containsKey(key); + assert loader2.get(fqn).containsKey(key); + assert dummyLoader2.get(fqn).containsKey(key); + + // evict from memory on all caches + cache1.evict(fqn, true); + cache2.evict(fqn, true); + + assert dummyLoader2.get(fqn).containsKey(key); + + Set s = new HashSet(); + s.add("b"); + assert s.equals(loader1.getChildrenNames(fqn)); + } +} Property changes on: core/trunk/src/test/java/org/jboss/cache/loader/ChainedClusteredCacheLoaderTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2009-04-30 11:23:30 UTC (rev 8029) +++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2009-04-30 11:38:24 UTC (rev 8030) @@ -169,9 +169,18 @@ assert cache1.peek(fqn, false) == null; assertEquals(3, childNames.size()); +// cache1.evict(child1); +// cache1.evict(child2); +// cache1.evict(child3); + cache1.evict(fqn, true); +// cache2.evict(child1); +// cache2.evict(child2); +// cache2.evict(child3); +// cache2.evict(fqn, true); childNames = loader2.getChildrenNames(fqn); assertNull("should be null", childNames); // calling a get on cache1 should cause the loader to retrieve the node from cache2 + cache1.evict(fqn, true); assertEquals("value", cache1.get(fqn, key)); // load up children assertEquals("value", cache1.get(child1, key));

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8029 - benchmarks/benchmark-fwk/branches/mavenized/caches.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:23:30 -0400 (Thu, 30 Apr 2009) New Revision: 8029 Added: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan40/ Removed: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/ Log: Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan40 (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan)

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8028 - in benchmarks/benchmark-fwk/branches/mavenized: caches/ehcache15 and 8 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:22:29 -0400 (Thu, 30 Apr 2009) New Revision: 8028 Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml benchmarks/benchmark-fwk/branches/mavenized/framework/pom.xml benchmarks/benchmark-fwk/branches/mavenized/parent/ benchmarks/benchmark-fwk/branches/mavenized/parent/pom.xml benchmarks/benchmark-fwk/branches/mavenized/pom.xml Log: Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-ehcache15</artifactId> + <name>Cache Benchmarking Framework - Wrapper EHCache15</name> + <description>Cache Benchmarking Framework - Wrapper EHCache15</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.5.0</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-ehcache16</artifactId> + <name>Cache Benchmarking Framework - Wrapper EHCache16</name> + <description>Cache Benchmarking Framework - Wrapper EHCache16</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-ehcache15</artifactId> + <version>2.0.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.6.0-beta3</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-infinispan40</artifactId> + <name>Cache Benchmarking Framework - Wrapper Infinispan40</name> + <description>Cache Benchmarking Framework - Wrapper Infinispan40</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <version>4.0.0.ALPHA2</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-jbosscache21</artifactId> + <name>Cache Benchmarking Framework - Wrapper JBossCache21</name> + <description>Cache Benchmarking Framework - Wrapper JBossCache21</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>2.1.1.GA</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-jbosscache22</artifactId> + <name>Cache Benchmarking Framework - Wrapper JBossCache22</name> + <description>Cache Benchmarking Framework - Wrapper JBossCache22</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>2.2.2.GA</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-jbosscache30</artifactId> + <name>Cache Benchmarking Framework - Wrapper JBossCache30</name> + <description>Cache Benchmarking Framework - Wrapper JBossCache30</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.0.3.GA</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-jbosscache31</artifactId> + <name>Cache Benchmarking Framework - Wrapper JBossCache31</name> + <description>Cache Benchmarking Framework - Wrapper JBossCache31</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.cachebench.wrappers</groupId> + <artifactId>wrapper-jbosscache30</artifactId> + <version>2.0.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </exclusion> + </exclusions> + + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.CR1</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/framework/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/framework/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,64 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench</groupId> + <artifactId>cachebench-framework</artifactId> + <name>Cache Benchmarking Framework</name> + <description>Cache Benchmarking Framework</description> + <version>2.0.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>commons-math</groupId> + <artifactId>commons-math</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.0</version> + </dependency> + + <dependency> + <groupId>jfreechart</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.0</version> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> +</project> + Property changes on: benchmarks/benchmark-fwk/branches/mavenized/framework/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/parent/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/parent/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/parent/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,119 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <name>Cachebench Common Parent</name> + <description>Cachebench common parent POM module</description> + <packaging>pom</packaging> + + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/copyleft/lesser.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + </dependencies> + + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>[1.5,)</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[2.1.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <downloadSources>true</downloadSources> + <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-idea-plugin</artifactId> + <configuration> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + </plugins> + <finalName>${artifactId}</finalName> + </build> + + <repositories> +  + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>Main Maven Repo</id> + <url>http://repo1.maven.org/maven2/</url> + </pluginRepository> + <pluginRepository> + <id>snapshots.repository.codehaus.org</id> + <url>http://snapshots.repository.codehaus.org</url> + </pluginRepository> + <pluginRepository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </pluginRepository> + <pluginRepository> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + </pluginRepository> + </pluginRepositories> +</project> Property changes on: benchmarks/benchmark-fwk/branches/mavenized/parent/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/pom.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/pom.xml 2009-04-30 11:22:29 UTC (rev 8028) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.cachebench</groupId> + <artifactId>cachebench-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>./parent/pom.xml</relativePath> + </parent> + + <groupId>org.cachebench</groupId> + <artifactId>cachebench</artifactId> + <version>2.0.0-SNAPSHOT</version> + + <name>Cache Benchmark Framework</name> + <description>Cache Benchmark Framework</description> + <packaging>pom</packaging> + + <modules> + <module>framework</module> + <module>caches/jbosscache21</module> + <module>caches/jbosscache22</module> + <module>caches/jbosscache30</module> + <module>caches/jbosscache31</module> + <module>caches/ehcache15</module> + <module>caches/ehcache16</module> + <module>caches/infinispan</module> +  +  + </modules> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + <executions> + <execution> + <id>assemble</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>assembly/assembly.xml</descriptor> + </descriptors> + <finalName>packaged</finalName> + <outputDirectory>target</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: benchmarks/benchmark-fwk/branches/mavenized/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8027 - in benchmarks/benchmark-fwk/branches/mavenized: assembly and 15 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:21:09 -0400 (Thu, 30 Apr 2009) New Revision: 8027 Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/ benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml benchmarks/benchmark-fwk/branches/mavenized/bin/ benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh benchmarks/benchmark-fwk/branches/mavenized/framework/ benchmarks/benchmark-fwk/branches/mavenized/framework/src/ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/ Removed: benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cache-products/infinispan-4.0.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.0.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.1.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.2.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-3.0.0/src/org/ benchmarks/benchmark-fwk/branches/mavenized/cluster.sh benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh benchmarks/benchmark-fwk/branches/mavenized/killNode.sh benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh benchmarks/benchmark-fwk/branches/mavenized/runNode.sh benchmarks/benchmark-fwk/branches/mavenized/src/org/ Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java Log: Deleted: benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,33 +0,0 @@ -#!/bin/bash - -scaling="2 4 6 8" -configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml" -#configs="distributed replicated" -products="jbosscache-3.0.0" - -mkdir output - -for product in $products -do - for config in $configs - do - for size in $scaling - do - nohup ./cluster.sh start $product $config $size - - outputFileName=data_${product}_${config}_${size}.csv - while [ ! -e $outputFileName ] - do - echo "Waiting for report [ $outputFileName ]" - sleep 5 - done - sleep 60 - mv $outputFileName output/ - done - done -done - - -echo Generating charts ... - -./generateChart -reportDir output Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includeSubModules>false</includeSubModules> + + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> +  + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}/conf</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/allJBossCacheTests.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/allJBossCacheTests.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,33 @@ +#!/bin/bash + +scaling="2 4 6 8" +configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml" +#configs="distributed replicated" +products="jbosscache-3.0.0" + +mkdir output + +for product in $products +do + for config in $configs + do + for size in $scaling + do + nohup ./cluster.sh start $product $config $size + + outputFileName=data_${product}_${config}_${size}.csv + while [ ! -e $outputFileName ] + do + echo "Waiting for report [ $outputFileName ]" + sleep 5 + done + sleep 60 + mv $outputFileName output/ + done + done +done + + +echo Generating charts ... + +./generateChart -reportDir output Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/bindAddress.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +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} + Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cluster.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/cluster.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,67 @@ +#!/bin/bash + +################################################################################## +# +# This script allows you to start multiple cache bench instances across a cluster +# +# Note that this requires BASH, as well as that all your instances have the cache +# bench framework installed in the same location. Finally, it requires SSH keys +# set up such that executing commands using +# +# $ ssh hostName "command" +# +# will work without prompting for passwords, or any user input. +# +################################################################################## + +## Some user-cnfigurable variables: + +# Defaults to the currently logged in user +SSH_USER=${USER} + +# Cache instance you wish to run - taken from the command line. +CACHE_DIST=${2} + +CFG_FILE=${3} + +# Number of servers to launch on - taken from the command line. +NUM_SERVERS=${4} + +COMMAND=${1} + +# the DNS domain of your servers +DOMAIN="qa.atl.jboss.com" +# the host names of available servers +HOSTNAMES=( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cluster07 cluster08 cluster09 cluster10 ) + +CACHE_BENCHMARK_HOME=`pwd` +echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME" + +case $COMMAND in + start) + for ((idx=0; idx < NUM_SERVERS ; idx++)) + do + server="${HOSTNAMES[idx]}" + echo Starting CacheBenchmarkFramework on host ${server} + ssh ${SSH_USER}(a)${server}.${DOMAIN} ". .bash_profile && cd ${CACHE_BENCHMARK_HOME} && ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} &" & + echo "Return code from ssh call is $?" + sleep 2 + done + ;; + stop) + for ((idx=0; idx < ${#HOSTNAMES[*]} ; idx++)) + do + server="${HOSTNAMES[idx]}" + echo Stopping CacheBenchmarkFramework on host ${server} + ssh ${SSH_USER}(a)${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &" + done + ;; + *) + echo "Usage: ${0} [start | stop] [cache distribution to test] [name of configuration file to use] [number of servers to launch on]" + echo + echo "Example:" + echo " ${0} start jbosscache-2.0.0 repl_async.xml 6" + echo " ${0} stop" + echo " Note that the stop command will stop all instances on all configured hosts" + ;; +esac Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/compareJBC2and3.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,88 @@ +#!/bin/bash + +runOnCluster() +{ + config="$1" + scaling="2 4 6 8" + for size in $scaling + do + nohup ./cluster.sh start $product $config $size + outputFileName=data_${product}_${config}_${size}.csv + while [ ! -e $outputFileName ] + do + echo "Waiting for report [ $outputFileName ]" + sleep 10 + done + sleep 30 + mv $outputFileName output/ + done +} + +doLoop() +{ + echo Product is $product and cfg set is $configs + for config in $configs + do + echo running set for $product using $config + runOnCluster $config + done +} + +jbc300() +{ + #### JBoss Cache 3.0.0 + product="jbosscache-3.0.0" + configs="mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml" + doLoop $product +} + +jbc220() +{ + #### JBoss Cache 2.2.0 + product="jbosscache-2.2.0" + configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml" + doLoop $product +} + +ehcache() +{ + #### EHCache + product="ehcache-1.5.0" + configs="ehcache-repl-sync.xml ehcache-repl-async.xml" + doLoop $product +} + +coherence() +{ + #### Coherence + product="coherence-3.3.1" + configs="repl-cache.xml dist-cache.xml" + doLoop $product +} + +startTime=`date +%s` +configs="" # This is global and accessible by all functions. + +if [ -e "output" ] +then + mv output output`date +%s`.old +fi +mkdir output + +# jbc300 +# jbc220 +# ehcache +coherence +echo Generating charts ... + +./generateChart.sh -reportDir output + +endTime=`date +%s` +minsTaken=`echo "scale=4;($endTime - $startTime)/60" | bc` + +echo ----- +echo ----- +echo Took $minsTaken minutes to run! +echo ----- +echo ----- + Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/generateChart.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,10 @@ +#!/bin/bash + +CP=.:classes/production/Framework:./conf + +for i in lib/*.jar +do + CP=$CP:$i +done + +java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*} Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/infinispan.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,57 @@ +#!/bin/bash + +scaling="2 4 6 8" +configs="repl-sync.xml repl-async.xml dist-sync.xml dist-async.xml" + +products="infinispan-4.0.0" + +mkdir output + +for product in $products +do + for config in $configs + do + for size in $scaling + do + nohup ./cluster.sh start $product $config $size + + outputFileName=data_${product}_${config}_${size}.csv + while [ ! -e $outputFileName ] + do + echo "Waiting for report [ $outputFileName ]" + sleep 5 + done + sleep 60 + mv $outputFileName output/ + done + done +done + +configs="mvcc-repl-sync.xml mvcc-repl-async.xml mvcc-repl-sync-br.xml mvcc-repl-async-br.xml" + +products="jbosscache-3.0.0" + +for product in $products +do + for config in $configs + do + for size in $scaling + do + nohup ./cluster.sh start $product $config $size + + outputFileName=data_${product}_${config}_${size}.csv + while [ ! -e $outputFileName ] + do + echo "Waiting for report [ $outputFileName ]" + sleep 5 + done + sleep 60 + mv $outputFileName output/ + done + done +done + + +echo Generating charts ... + +./generateChart.sh -reportDir output Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/jvm_params.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -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 Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/killNode.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/killNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,12 @@ +#!/bin/sh + +################################################################################## +# +# This script allows you to kill benchmark runner instances started with runNode.sh +# +################################################################################## + +ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -c 14-20 | xargs -r kill -9 +ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9 +ps -elf | grep /runNode.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9 +exit 0 \ No newline at end of file Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/runAllLocal.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,33 @@ +#!/bin/bash + +for jdk in java5 java6 ; do +source ${jdk} +#jdk=java5 +rm -rf ./output/* + +export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g" +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RC.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RR.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RC-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RR-FIFO.xml + + +mkdir output +mv data* ./output + +./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget + +done + Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/runLocalNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,61 @@ +#!/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 +# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp + +preferIPv4Stack=true +DEBUG=debug +CACHE_PRODUCT=${1} +TEST_CFG=${2} +hostname=`hostname` +PIDFILE=PID.${hostname}.pid + +if [ -z $1 ] +then + echo Usage: + echo + echo ./runNode.sh [cache product to test] [test config file] + echo param [cache product to test] : must be one of the directories names under './cache-products' + echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/' + echo + echo Example: './runNode.sh jbosscache-2.0.0 repl_async.xml' will start the 1st node running an instance of jbc2.0.0 in standalone [LOCAL] mode using the repl_async configuration. + exit 1 +fi + +#libraries needed by the fwk, add them to the classpath +for JAR in ./lib/* +do + CLASSPATH=$CLASSPATH:$JAR +done + +export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework + +configFile=./cache-products/${CACHE_PRODUCT}/config.sh + +#first check whether the config file exists and load it +if [ -f ${configFile} ] +then + . ${configFile} + echo Calling ${configFile} exit code is $? +else + echo could not find config file ${configFile}, aborting! + exit 2 +fi + +#. ./bindAddress.sh +#echo bind address exit code is $? + +JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -Djava.net.preferIPv4Stack=${preferIPv4Stack} -DlocalOnly=true" +TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" + +if [ "$DEBUG" = "debug" ] +then + echo Executing: + echo ${TO_EXECUTE} + echo +fi + +${TO_EXECUTE} +echo $!>${PIDFILE} +echo "Return code from benchmark runner is $?" + Copied: benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/runNode.sh) =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/bin/runNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -0,0 +1,72 @@ +#!/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 +# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp +# todo mmarkus - add another configuration file to set all the jvm params, which should be called by this one (phps benchmatrk-jvm.sh) +# todo mmarkus - move the scripts in an bin directory as there are more and more scrips now +# todo mmarkus - if allJbossCacheTests.sh is launched with nohup it does not work, make that work + +preferIPv4Stack=true +DEBUG=debug +CURRENT_INDEX=${1} +CACHE_PRODUCT=${2} +TEST_CFG=${3} +CLUSTER_SIZE=${4} +hostname=`hostname` +PIDFILE=PID.${hostname}.pid + +if [ -z $1 ] +then + echo Usage: + echo + echo ./runNode.sh [current node index] [cache product to test] [test config file] [cluster size] + echo param [current node index] : the index of this node in the list of nodes in the cluster [0 .. <cluster size> - 1] + echo param [cache product to test] : must be one of the directories names under './cache-products' + echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/' + echo param [cluster size] : total number of nodes that will run tests. + echo + echo Example: './runNode.sh 0 jbosscache-2.2.0 pess-repl-sync.xml 3' will start the 1st node running an instance of jbc2.0.0 on a cluster made out of 3 nodes, using the repl_async configuration. + exit 1 +fi + +#libraries needed by the fwk, add them to the classpath +for JAR in ./lib/* +do + CLASSPATH=$CLASSPATH:$JAR +done + +export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework + +configFile=./cache-products/${CACHE_PRODUCT}/config.sh + +#first check whether the config file exists and load it +if [ -f ${configFile} ] +then + . ${configFile} + echo Calling ${configFile} exit code is $? +else + echo could not find config file ${configFile}, aborting! + exit 2 +fi + +. ./bindAddress.sh +. ./jvm_params.sh + +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}" + +# Sample JPDA settings for remote socket debuging +#JVM_OPTIONS="$JVM_OPTIONS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=y" + +TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" + +if [ "$DEBUG" = "debug" ] +then + echo Executing: + echo ${TO_EXECUTE} + echo +fi + +${TO_EXECUTE} +#echo $!>${PIDFILE} +echo "Return code from benchmark runner is $?" + Deleted: benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/bindAddress.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,5 +0,0 @@ -#!/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} - Deleted: benchmarks/benchmark-fwk/branches/mavenized/cluster.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/cluster.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/cluster.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,67 +0,0 @@ -#!/bin/bash - -################################################################################## -# -# This script allows you to start multiple cache bench instances across a cluster -# -# Note that this requires BASH, as well as that all your instances have the cache -# bench framework installed in the same location. Finally, it requires SSH keys -# set up such that executing commands using -# -# $ ssh hostName "command" -# -# will work without prompting for passwords, or any user input. -# -################################################################################## - -## Some user-cnfigurable variables: - -# Defaults to the currently logged in user -SSH_USER=${USER} - -# Cache instance you wish to run - taken from the command line. -CACHE_DIST=${2} - -CFG_FILE=${3} - -# Number of servers to launch on - taken from the command line. -NUM_SERVERS=${4} - -COMMAND=${1} - -# the DNS domain of your servers -DOMAIN="qa.atl.jboss.com" -# the host names of available servers -HOSTNAMES=( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cluster07 cluster08 cluster09 cluster10 ) - -CACHE_BENCHMARK_HOME=`pwd` -echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME" - -case $COMMAND in - start) - for ((idx=0; idx < NUM_SERVERS ; idx++)) - do - server="${HOSTNAMES[idx]}" - echo Starting CacheBenchmarkFramework on host ${server} - ssh ${SSH_USER}(a)${server}.${DOMAIN} ". .bash_profile && cd ${CACHE_BENCHMARK_HOME} && ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} &" & - echo "Return code from ssh call is $?" - sleep 2 - done - ;; - stop) - for ((idx=0; idx < ${#HOSTNAMES[*]} ; idx++)) - do - server="${HOSTNAMES[idx]}" - echo Stopping CacheBenchmarkFramework on host ${server} - ssh ${SSH_USER}(a)${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME} && ./killNode.sh &" - done - ;; - *) - echo "Usage: ${0} [start | stop] [cache distribution to test] [name of configuration file to use] [number of servers to launch on]" - echo - echo "Example:" - echo " ${0} start jbosscache-2.0.0 repl_async.xml 6" - echo " ${0} stop" - echo " Note that the stop command will stop all instances on all configured hosts" - ;; -esac Deleted: benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/compareJBC2and3.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,88 +0,0 @@ -#!/bin/bash - -runOnCluster() -{ - config="$1" - scaling="2 4 6 8" - for size in $scaling - do - nohup ./cluster.sh start $product $config $size - outputFileName=data_${product}_${config}_${size}.csv - while [ ! -e $outputFileName ] - do - echo "Waiting for report [ $outputFileName ]" - sleep 10 - done - sleep 30 - mv $outputFileName output/ - done -} - -doLoop() -{ - echo Product is $product and cfg set is $configs - for config in $configs - do - echo running set for $product using $config - runOnCluster $config - done -} - -jbc300() -{ - #### JBoss Cache 3.0.0 - product="jbosscache-3.0.0" - configs="mvcc-repl-sync.xml mvcc-repl-sync-br.xml mvcc-repl-async.xml" - doLoop $product -} - -jbc220() -{ - #### JBoss Cache 2.2.0 - product="jbosscache-2.2.0" - configs="pess-repl-sync.xml pess-repl-sync-br.xml pess-repl-async.xml" - doLoop $product -} - -ehcache() -{ - #### EHCache - product="ehcache-1.5.0" - configs="ehcache-repl-sync.xml ehcache-repl-async.xml" - doLoop $product -} - -coherence() -{ - #### Coherence - product="coherence-3.3.1" - configs="repl-cache.xml dist-cache.xml" - doLoop $product -} - -startTime=`date +%s` -configs="" # This is global and accessible by all functions. - -if [ -e "output" ] -then - mv output output`date +%s`.old -fi -mkdir output - -# jbc300 -# jbc220 -# ehcache -coherence -echo Generating charts ... - -./generateChart.sh -reportDir output - -endTime=`date +%s` -minsTaken=`echo "scale=4;($endTime - $startTime)/60" | bc` - -echo ----- -echo ----- -echo Took $minsTaken minutes to run! -echo ----- -echo ----- - Copied: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/src/org) Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/cluster/Message.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Message.java 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,7 +1,6 @@ package org.cachebench.cluster; import java.io.Serializable; -import java.net.SocketAddress; import java.net.InetSocketAddress; /** Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/cluster/Transport.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/cluster/Transport.java 2009-04-30 11:21:09 UTC (rev 8027) @@ -2,7 +2,6 @@ import org.cachebench.config.ClusterConfig; -import java.util.Properties; import java.util.Map; /** Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/reportgenerators/PutGetChartGenerator.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/PutGetChartGenerator.java 2009-04-30 11:21:09 UTC (rev 8027) @@ -104,7 +104,6 @@ chart.setBorderVisible(true); chart.setAntiAlias(true); - chart.setTextAntiAlias(true); chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1)); return chart; } Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/reportgenerators/ThroughputChartGenerator.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/reportgenerators/ThroughputChartGenerator.java 2009-04-30 11:21:09 UTC (rev 8027) @@ -65,7 +65,6 @@ chart.addSubtitle(getSubtitle()); chart.setBorderVisible(true); chart.setAntiAlias(true); - chart.setTextAntiAlias(true); chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1)); return chart; } Modified: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/src/org/cachebench/smartfrog/CacheBenchmarkPrim.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/java/org/cachebench/smartfrog/CacheBenchmarkPrim.java 2009-04-30 11:21:09 UTC (rev 8027) @@ -8,9 +8,6 @@ //import org.smartfrog.sfcore.prim.PrimImpl; //import org.smartfrog.sfcore.prim.TerminationRecord; -import java.io.*; -import java.rmi.RemoteException; - /** * @author Mircea.Markus(a)jboss.com */ Deleted: benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/generateChart.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,10 +0,0 @@ -#!/bin/bash - -CP=.:classes/production/Framework:./conf - -for i in lib/*.jar -do - CP=$CP:$i -done - -java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*} Deleted: benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/infinispan.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,57 +0,0 @@ -#!/bin/bash - -scaling="2 4 6 8" -configs="repl-sync.xml repl-async.xml dist-sync.xml dist-async.xml" - -products="infinispan-4.0.0" - -mkdir output - -for product in $products -do - for config in $configs - do - for size in $scaling - do - nohup ./cluster.sh start $product $config $size - - outputFileName=data_${product}_${config}_${size}.csv - while [ ! -e $outputFileName ] - do - echo "Waiting for report [ $outputFileName ]" - sleep 5 - done - sleep 60 - mv $outputFileName output/ - done - done -done - -configs="mvcc-repl-sync.xml mvcc-repl-async.xml mvcc-repl-sync-br.xml mvcc-repl-async-br.xml" - -products="jbosscache-3.0.0" - -for product in $products -do - for config in $configs - do - for size in $scaling - do - nohup ./cluster.sh start $product $config $size - - outputFileName=data_${product}_${config}_${size}.csv - while [ ! -e $outputFileName ] - do - echo "Waiting for report [ $outputFileName ]" - sleep 5 - done - sleep 60 - mv $outputFileName output/ - done - done -done - - -echo Generating charts ... - -./generateChart.sh -reportDir output Deleted: benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/jvm_params.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,5 +0,0 @@ -#!/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 Deleted: benchmarks/benchmark-fwk/branches/mavenized/killNode.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/killNode.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/killNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,12 +0,0 @@ -#!/bin/sh - -################################################################################## -# -# This script allows you to kill benchmark runner instances started with runNode.sh -# -################################################################################## - -ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -c 14-20 | xargs -r kill -9 -ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9 -ps -elf | grep /runNode.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9 -exit 0 \ No newline at end of file Deleted: benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/runAllLocal.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,33 +0,0 @@ -#!/bin/bash - -for jdk in java5 java6 ; do -source ${jdk} -#jdk=java5 -rm -rf ./output/* - -export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g" -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" -./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" -./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" -./runLocalNode.sh infinispan-4.0.0 local-RC.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" -./runLocalNode.sh infinispan-4.0.0 local-RR.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" -./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC-FIFO.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" -./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR-FIFO.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" -./runLocalNode.sh infinispan-4.0.0 local-RC-FIFO.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" -./runLocalNode.sh infinispan-4.0.0 local-RR-FIFO.xml - - -mkdir output -mv data* ./output - -./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget - -done - Deleted: benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/runAllLocalEH.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,21 +0,0 @@ -#!/bin/bash - -for jdk in java5 java6 ; do -source ${jdk} -#jdk=java5 -rm -rf ./output/* - -export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g" -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" -./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" -./runLocalNode.sh infinispan-4.0.0 local-RC.xml - - -mkdir output -mv data* ./output - -./generateChart.sh -reportDir output -o LocalMode-${jdk} -chartType putget - -done - Deleted: benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/runLocalNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,61 +0,0 @@ -#!/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 -# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp - -preferIPv4Stack=true -DEBUG=debug -CACHE_PRODUCT=${1} -TEST_CFG=${2} -hostname=`hostname` -PIDFILE=PID.${hostname}.pid - -if [ -z $1 ] -then - echo Usage: - echo - echo ./runNode.sh [cache product to test] [test config file] - echo param [cache product to test] : must be one of the directories names under './cache-products' - echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/' - echo - echo Example: './runNode.sh jbosscache-2.0.0 repl_async.xml' will start the 1st node running an instance of jbc2.0.0 in standalone [LOCAL] mode using the repl_async configuration. - exit 1 -fi - -#libraries needed by the fwk, add them to the classpath -for JAR in ./lib/* -do - CLASSPATH=$CLASSPATH:$JAR -done - -export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework - -configFile=./cache-products/${CACHE_PRODUCT}/config.sh - -#first check whether the config file exists and load it -if [ -f ${configFile} ] -then - . ${configFile} - echo Calling ${configFile} exit code is $? -else - echo could not find config file ${configFile}, aborting! - exit 2 -fi - -#. ./bindAddress.sh -#echo bind address exit code is $? - -JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cacheProductName=${CACHE_PRODUCT} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -Djava.net.preferIPv4Stack=${preferIPv4Stack} -DlocalOnly=true" -TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" - -if [ "$DEBUG" = "debug" ] -then - echo Executing: - echo ${TO_EXECUTE} - echo -fi - -${TO_EXECUTE} -echo $!>${PIDFILE} -echo "Return code from benchmark runner is $?" - Deleted: benchmarks/benchmark-fwk/branches/mavenized/runNode.sh =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/runNode.sh 2009-04-30 11:20:46 UTC (rev 8026) +++ benchmarks/benchmark-fwk/branches/mavenized/runNode.sh 2009-04-30 11:21:09 UTC (rev 8027) @@ -1,72 +0,0 @@ -#!/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 -# those would make an automatic conversion from unix CLASSPATH to win classpath, needed when executing java -cp -# todo mmarkus - add another configuration file to set all the jvm params, which should be called by this one (phps benchmatrk-jvm.sh) -# todo mmarkus - move the scripts in an bin directory as there are more and more scrips now -# todo mmarkus - if allJbossCacheTests.sh is launched with nohup it does not work, make that work - -preferIPv4Stack=true -DEBUG=debug -CURRENT_INDEX=${1} -CACHE_PRODUCT=${2} -TEST_CFG=${3} -CLUSTER_SIZE=${4} -hostname=`hostname` -PIDFILE=PID.${hostname}.pid - -if [ -z $1 ] -then - echo Usage: - echo - echo ./runNode.sh [current node index] [cache product to test] [test config file] [cluster size] - echo param [current node index] : the index of this node in the list of nodes in the cluster [0 .. <cluster size> - 1] - echo param [cache product to test] : must be one of the directories names under './cache-products' - echo param [test config file] : configuration file to use with the cache product. Typically resides in './cache-products/XXX/conf/' - echo param [cluster size] : total number of nodes that will run tests. - echo - echo Example: './runNode.sh 0 jbosscache-2.2.0 pess-repl-sync.xml 3' will start the 1st node running an instance of jbc2.0.0 on a cluster made out of 3 nodes, using the repl_async configuration. - exit 1 -fi - -#libraries needed by the fwk, add them to the classpath -for JAR in ./lib/* -do - CLASSPATH=$CLASSPATH:$JAR -done - -export CLASSPATH=$CLASSPATH:./conf:./classes/production/Framework - -configFile=./cache-products/${CACHE_PRODUCT}/config.sh - -#first check whether the config file exists and load it -if [ -f ${configFile} ] -then - . ${configFile} - echo Calling ${configFile} exit code is $? -else - echo could not find config file ${configFile}, aborting! - exit 2 -fi - -. ./bindAddress.sh -. ./jvm_params.sh - -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}" - -# Sample JPDA settings for remote socket debuging -#JVM_OPTIONS="$JVM_OPTIONS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=y" - -TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" - -if [ "$DEBUG" = "debug" ] -then - echo Executing: - echo ${TO_EXECUTE} - echo -fi - -${TO_EXECUTE} -#echo $!>${PIDFILE} -echo "Return code from benchmark runner is $?" -

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8026 - in benchmarks/benchmark-fwk/branches/mavenized: caches and 38 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 07:20:46 -0400 (Thu, 30 Apr 2009) New Revision: 8026 Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/resources/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/resources/ Removed: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java Modified: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java Log: Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org) Deleted: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-30 11:20:46 UTC (rev 8026) @@ -1,102 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.cachebench.cachewrappers; - -import org.testng.annotations.Test; -import org.testng.annotations.BeforeMethod; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.Element; -import net.sf.ehcache.Ehcache; - -/** - * @author Mircea.Markus(a)jboss.com - */ -@Test -public class EHCacheReplicationTest -{ - - @BeforeMethod - public void setUp() - { - System.setProperty("bind.address","127.0.0.1");//bind address referenced from config file - } - - - public void testSyncReplication() throws Exception - { - Ehcache cache1; - Ehcache cache2; - - CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml"); - CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml"); - - - cache1 = c1.getCache("cache"); - cache2 = c2.getCache("cache"); - - Thread.sleep(5000); - - System.out.println("c1 members: " + c1.getCachePeerListener("RMI").getBoundCachePeers()); - System.out.println("c2 members" + c2.getCachePeerListener("RMI").getBoundCachePeers()); - assert c1.getCachePeerListener("RMI").getBoundCachePeers().size() == 1; - assert c2.getCachePeerListener("RMI").getBoundCachePeers().size() == 1; - - for (int i = 0; i < 100; i++) - { - cache1.put(new Element("key" + i, "value" + i)); - assert cache2.get("key" + i).getValue().equals("value" + i); - } - System.out.println(cache1.getKeys()); - System.out.println(cache2.getKeys()); - - c1.shutdown(); - c2.shutdown(); - } - - - public void testInvalidation() throws Exception - { - Ehcache cache1; - Ehcache cache2; - - CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml"); - CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml"); - - cache1 = c1.getCache("cache"); - cache2 = c2.getCache("cache"); - - Thread.sleep(5000); - - System.out.println("c1 members: " + c1.getCachePeerListener("RMI").getBoundCachePeers()); - System.out.println("c2 members" + c2.getCachePeerListener("RMI").getBoundCachePeers()); - assert c1.getCachePeerListener("RMI").getBoundCachePeers().size() == 1; - assert c2.getCachePeerListener("RMI").getBoundCachePeers().size() == 1; - - cache1.put(new Element("key","value")); - assert cache2.get("key").getValue().equals("value"); - cache2.put(new Element("key","newValue")); - assert cache1.get("key") == null; - - c1.shutdown(); - c2.shutdown(); - } -} Deleted: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-30 11:20:46 UTC (rev 8026) @@ -1,53 +0,0 @@ -package org.cachebench.cachewrappers; - -import net.sf.ehcache.Ehcache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.Element; - -import java.net.URL; -import java.io.File; -import java.util.Properties; - -import org.cachebench.CacheWrapper; - -/** - * // TODO: Add Javadocs - * - * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> - * @since 2.0.0 - */ -public class EHCacheTest -{ - - public static void main(String[] args) throws Exception - { - - - CacheWrapper w = new EHCacheWrapper(); - Properties p = new Properties(); - p.setProperty("config", "ehcache-repl-sync.xml"); - w.init(p); - - Ehcache cache; - URL url = new URL("file:///Users/manik/Code/CacheBenchFwk/cache-products/ehcache-1.2.4/conf/ehcache-repl-sync.xml"); - - System.out.println("URL " + url); - - System.out.println("FIle: " + url.getFile()); - CacheManager m = CacheManager.create(url); - - System.out.println("Caches:"); - for (String s : m.getCacheNames()) System.out.println(" " + s); - - cache = m.getCache("cache"); - - for (int i=0; i<100; i++) cache.put(new Element("key" + i, "value" + i)); - - System.out.println(cache.getKeys()); - - System.out.println("members: " + m.getCachePeerListener("RMI").getBoundCachePeers()); - - m.shutdown(); - - } -} Modified: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheWrapper.java 2009-04-29 22:08:39 UTC (rev 8024) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java 2009-04-30 11:20:46 UTC (rev 8026) @@ -60,8 +60,8 @@ log.info("Using named cache " + cache); if (!localmode) { - log.info("Bounded peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers()); - log.info("Remote peers: " + manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache)); + log.info("Bounded peers: " + manager.getCachePeerListener().getBoundCachePeers()); + log.info("Remote peers: " + manager.getCacheManagerPeerProvider().listRemoteCachePeers(cache)); } } @@ -118,13 +118,12 @@ public int getNumMembers() { - - return localmode ? 0 : manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache).size(); + return localmode ? 0 : manager.getCacheManagerPeerProvider().listRemoteCachePeers(cache).size(); } public String getInfo() { - return cache.getKeys().toString() + (localmode ? "" : (" remote peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers())); + return cache.getKeys().toString() + (localmode ? "" : (" remote peers: " + manager.getCachePeerListener().getBoundCachePeers())); } public Object getReplicatedData(List<String> path, String key) throws Exception Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-30 11:20:46 UTC (rev 8026) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.cachebench.cachewrappers; + +import org.testng.annotations.Test; +import org.testng.annotations.BeforeMethod; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; +import net.sf.ehcache.Ehcache; + +/** + * @author Mircea.Markus(a)jboss.com + */ +@Test (enabled = false) +public class EHCacheReplicationTest +{ + + @BeforeMethod + public void setUp() + { + System.setProperty("bind.address","127.0.0.1");//bind address referenced from config file + } + + + public void testSyncReplication() throws Exception + { + Ehcache cache1; + Ehcache cache2; + + CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml"); + CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml"); + + + cache1 = c1.getCache("cache"); + cache2 = c2.getCache("cache"); + + Thread.sleep(5000); + + System.out.println("c1 members: " + c1.getCachePeerListener().getBoundCachePeers()); + System.out.println("c2 members" + c2.getCachePeerListener().getBoundCachePeers()); + assert c1.getCachePeerListener().getBoundCachePeers().size() == 1; + assert c2.getCachePeerListener().getBoundCachePeers().size() == 1; + + for (int i = 0; i < 100; i++) + { + cache1.put(new Element("key" + i, "value" + i)); + assert cache2.get("key" + i).getValue().equals("value" + i); + } + System.out.println(cache1.getKeys()); + System.out.println(cache2.getKeys()); + + c1.shutdown(); + c2.shutdown(); + } + + + public void testInvalidation() throws Exception + { + Ehcache cache1; + Ehcache cache2; + + CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml"); + CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml"); + + cache1 = c1.getCache("cache"); + cache2 = c2.getCache("cache"); + + Thread.sleep(5000); + + System.out.println("c1 members: " + c1.getCachePeerListener().getBoundCachePeers()); + System.out.println("c2 members" + c2.getCachePeerListener().getBoundCachePeers()); + assert c1.getCachePeerListener().getBoundCachePeers().size() == 1; + assert c2.getCachePeerListener().getBoundCachePeers().size() == 1; + + cache1.put(new Element("key","value")); + assert cache2.get("key").getValue().equals("value"); + cache2.put(new Element("key","newValue")); + assert cache1.get("key") == null; + + c1.shutdown(); + c2.shutdown(); + } +} Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-30 11:20:46 UTC (rev 8026) @@ -0,0 +1,47 @@ +package org.cachebench.cachewrappers; + +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Ehcache; +import net.sf.ehcache.Element; +import org.cachebench.CacheWrapper; +import org.testng.annotations.Test; + +import java.net.URL; +import java.util.Properties; + +@Test(enabled = false) +public class EHCacheTest +{ + + public static void main(String[] args) throws Exception + { + + + CacheWrapper w = new EHCacheWrapper(); + Properties p = new Properties(); + p.setProperty("config", "ehcache-repl-sync.xml"); + w.init(p); + + Ehcache cache; + URL url = new URL("file:///Users/manik/Code/CacheBenchFwk/cache-products/ehcache-1.2.4/conf/ehcache-repl-sync.xml"); + + System.out.println("URL " + url); + + System.out.println("FIle: " + url.getFile()); + CacheManager m = CacheManager.create(url); + + System.out.println("Caches:"); + for (String s : m.getCacheNames()) System.out.println(" " + s); + + cache = m.getCache("cache"); + + for (int i=0; i<100; i++) cache.put(new Element("key" + i, "value" + i)); + + System.out.println(cache.getKeys()); + + System.out.println("members: " + m.getCachePeerListener().getBoundCachePeers()); + + m.shutdown(); + + } +} Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/infinispan-4.0.0/src/org) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.1.0/src/org) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.2.0/src/org) Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-3.0.0/src/org)

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8025 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-30 06:33:33 -0400 (Thu, 30 Apr 2009) New Revision: 8025 Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java Log: [JBCACHE-1507] (IllegalArgumentException during BuddyManager handling of removed node) Fixed BuddyFqnTransformer + added unit test Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2009-04-29 22:08:39 UTC (rev 8024) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2009-04-30 10:33:33 UTC (rev 8025) @@ -102,7 +102,10 @@ if (!isBackupFqn(fqn)) return fqn; if (fqn.equals(BUDDY_BACKUP_SUBTREE_FQN)) return Fqn.ROOT; // remove the first 2 (or 3 in the case of a dead backup region) elements - return fqn.getSubFqn(isDeadBackupFqn(fqn) ? 3 : 2, fqn.size()); + boolean isDead = isDeadBackupFqn(fqn); + int fqnSz = fqn.size(); + if (isDead && fqnSz == 2) return Fqn.ROOT; + return fqn.getSubFqn(isDead ? 3 : 2, fqnSz); } /** Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2009-04-29 22:08:39 UTC (rev 8024) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2009-04-30 10:33:33 UTC (rev 8025) @@ -39,4 +39,18 @@ { assert Fqn.ROOT == buddyFqnTransformer.getBackupRootFromFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); } + + public void testGetActualFqnOnDeadBackup() + { + Fqn deadBackup = Fqn.fromString("/_BUDDY_BACKUP_/1.2.3.4_5678:DEAD/5/a/b/c/d"); + Fqn actualFqn = Fqn.fromString("/a/b/c/d"); + assert actualFqn.equals(buddyFqnTransformer.getActualFqn(deadBackup)); + } + + public void testGetActualFqnOnIncompleteDeadBackup() + { + Fqn deadBackup = Fqn.fromString("/_BUDDY_BACKUP_/1.2.3.4_5678:DEAD"); + Fqn actualFqn = Fqn.ROOT; + assert actualFqn.equals(buddyFqnTransformer.getActualFqn(deadBackup)); + } }

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8024 - benchmarks/benchmark-fwk/branches.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2009-04-29 18:08:39 -0400 (Wed, 29 Apr 2009) New Revision: 8024 Added: benchmarks/benchmark-fwk/branches/mavenized/ Log: Copied: benchmarks/benchmark-fwk/branches/mavenized (from rev 8023, benchmarks/benchmark-fwk/trunk)

14 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r8023 - enterprise-docs/tags/JBoss_EAP_4_3/Cache_Tree_Cache_Guide/de-DE.

by jbosscache-commits＠lists.jboss.org

Author: jdimanos(a)jboss.com Date: 2009-04-29 17:26:03 -0400 (Wed, 29 Apr 2009) New Revision: 8023 Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Tree_Cache_Guide/de-DE/Cache_loaders.po Log: update Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Tree_Cache_Guide/de-DE/Cache_loaders.po =================================================================== --- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Tree_Cache_Guide/de-DE/Cache_loaders.po 2009-04-29 09:16:40 UTC (rev 8022) +++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Tree_Cache_Guide/de-DE/Cache_loaders.po 2009-04-29 21:26:03 UTC (rev 8023) @@ -1,24 +1,26 @@ +# translation of Cache_loaders.po to # Language /tmp/mike/JBEAP420/Cache translations for JBEAP package. -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009 Free Software Foundation, Inc. # Automatically generated, 2007. # msgid "" msgstr "" -"Project-Id-Version: JBEAP 420\n" +"Project-Id-Version: Cache_loaders\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-09-21 04:43+0000\n" -"PO-Revision-Date: 2001-02-09 01:25+0100\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2009-04-30 07:25+1000\n" +"Last-Translator: \n" +"Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #. Tag: title #: Cache_loaders.xml:5 #, no-c-format msgid "Cache Loaders" -msgstr "" +msgstr "Cache-Lader" #. Tag: para #: Cache_loaders.xml:6 @@ -28,6 +30,9 @@ "memory cache to a backend datastore. If JBoss Cache is configured with a " "cache loader, then the following features are provided:" msgstr "" +"JBoss Cache kann einen <emphasis>Cache Lader</emphasis> für das Back-up " +"des speicherinternen Cache zu einem Backend-Datenspeicher verwenden. Wird JBoss " +"Cache mit einem Cache-Lader konfiguriert, so stehen folgende Features zur Verfügung:" #. Tag: para #: Cache_loaders.xml:9 @@ -255,6 +260,176 @@ " void storeEntireState(byte[] state) throws Exception;\n" "}" msgstr "" +"public interface CacheLoader extends Service {\n" +"\n" +" /**\n" +" * Sets the configuration. Will be called before {@link #create()} and " +"{@link #start()}\n" +" * @param props A set of properties specific to a given CacheLoader\n" +" */\n" +" void setConfig(Properties props);\n" +"\n" +" void setCache(TreeCache c);\n" +"\n" +"\n" +" /**\n" +" * Returns a list of children names, all names are <em>relative</" +"em>. Returns null if \n" +" * the parent node is not found.\n" +" * The returned set must not be modified, e.g. use Collections." +"unmodifiableSet(s) to \n" +" * return the result\n" +" * @param fqn The FQN of the parent\n" +" * @return Set<String>. A list of children. Returns null if no " +"children nodes are present,\n" +" * or the parent is not present\n" +" */\n" +" Set getChildrenNames(Fqn fqn) throws Exception;\n" +"\n" +"\n" +" /**\n" +" * Returns the value for a given key. Returns null if the node doesn't " +"exist, or the value \n" +" * is not bound\n" +" */\n" +" Object get(Fqn name, Object key) throws Exception;\n" +"\n" +"\n" +" /**\n" +" * Returns all keys and values from the persistent store, given a fully " +"qualified name.\n" +" * \n" +" * NOTE that the expected return value of this method has changed from " +"JBossCache 1.2.x \n" +" * and before! This will affect cache loaders written prior to " +"JBossCache 1.3.0 and such \n" +" * implementations should be checked for compliance with the behaviour " +"expected.\n" +" * \n" +" * @param name\n" +" * @return Map<Object,Object> of keys and values for the given " +"node. Returns null if the \n" +" * node is not found. If the node is found but has no attributes, this " +"method returns \n" +" * an empty Map.\n" +" * @throws Exception\n" +" */\n" +" Map get(Fqn name) throws Exception;\n" +"\n" +"\n" +"\n" +" /**\n" +" * Checks whether the CacheLoader has a node with Fqn\n" +" * @return True if node exists, false otherwise\n" +" */\n" +" boolean exists(Fqn name) throws Exception;\n" +"\n" +"\n" +" /**\n" +" * Inserts key and value into the attributes hashmap of the given node. " +"If the node does \n" +" * not exist, all parent nodes from the root down are created " +"automatically\n" +" */\n" +" void put(Fqn name, Object key, Object value) throws Exception;\n" +"\n" +" /**\n" +" * Inserts all elements of attributes into the attributes hashmap of the " +"given node, \n" +" * overwriting existing attributes, but not clearing the existing hashmap " +"before\n" +" * insertion (making it a union of existing and new attributes)\n" +" * If the node does not exist, all parent nodes from the root down are " +"created \n" +" * automatically\n" +" * @param name The fully qualified name of the node\n" +" * @param attributes A Map of attributes. Can be null\n" +" */\n" +" void put(Fqn name, Map attributes) throws Exception;\n" +"\n" +" /**\n" +" * Inserts all modifications to the backend store. Overwrite whatever is " +"already in\n" +" * the datastore.\n" +" * @param modifications A List<Modification> of modifications\n" +" * @throws Exception\n" +" */\n" +" void put(List modifications) throws Exception;\n" +"\n" +" /** Removes the given key and value from the attributes of the given " +"node. \n" +" * No-op if node doesn't exist */\n" +" void remove(Fqn name, Object key) throws Exception;\n" +"\n" +" /**\n" +" * Removes the given node. If the node is the root of a subtree, this " +"will recursively \n" +" * remove all subnodes, depth-first\n" +" */\n" +" void remove(Fqn name) throws Exception;\n" +"\n" +" /** Removes all attributes from a given node, but doesn't delete the node " +"itself */\n" +" void removeData(Fqn name) throws Exception;\n" +"\n" +"\n" +" /**\n" +" * Prepare the modifications. For example, for a DB-based CacheLoader:\n" +" * \n" +" * Create a local (JDBC) transaction\n" +" * Associate the local transaction with tx (tx is the key)\n" +" * Execute the coresponding SQL statements against the DB (statements " +"derived from \n" +" *modifications)\n" +" * \n" +" * For non-transactional CacheLoader (e.g. file-based), this could be a " +"null operation\n" +" * @param tx The transaction, just used as a hashmap key\n" +" * @param modifications List<Modification>, a list of all " +"modifications within the given \n" +" * transaction\n" +" * @param one_phase Persist immediately and (for example) commit the " +"local JDBC \n" +" * transaction as well. When true, we won't get a {@link #commit(Object)} " +"or \n" +" * {@link #rollback(Object)} method call later\n" +" */\n" +" void prepare(Object tx, List modifications, boolean one_phase) throws " +"Exception;\n" +"\n" +" /**\n" +" * Commit the transaction. A DB-based CacheLoader would look up the local " +"JDBC transaction \n" +" * associated with tx and commit that transaction\n" +" * Non-transactional CacheLoaders could simply write the data that was " +"previously saved \n" +" * transiently under the given tx key, to (for example) a file system " +"(note this only holds if \n" +" * the previous prepare() did not define one_phase=true\n" +" */\n" +" void commit(Object tx) throws Exception;\n" +"\n" +" /**\n" +" * Roll the transaction back. A DB-based CacheLoader would look up the " +"local JDBC \n" +" * transaction associated with tx and roll back that transaction\n" +" */\n" +" void rollback(Object tx);\n" +"\n" +" /**\n" +" * Fetch the entire state for this cache from secondary storage (disk, " +"DB) and return\n" +" * it as a byte buffer. This is for initialization of a new cache from a " +"remote cache. \n" +" * The new cache would then call storeEntireState()\n" +" * todo: define binary format for exchanging state\n" +" */\n" +" byte[] loadEntireState() throws Exception;\n" +"\n" +" /** Store the given state in secondary storage. Overwrite whatever is " +"currently in storage */\n" +" void storeEntireState(byte[] state) throws Exception;\n" +"}" #. Tag: para #: Cache_loaders.xml:26 @@ -343,6 +518,65 @@ "\n" "}" msgstr "" +"public interface ExtendedCacheLoader extends CacheLoader\n" +"{\n" +" /**\n" +" * Fetch a portion of the state for this cache from secondary storage \n" +" * (disk, DB) and return it as a byte buffer.\n" +" * This is for activation of a portion of new cache from a remote " +"cache. \n" +" * The new cache would then call {@link #storeState(byte[], Fqn)}.\n" +" * \n" +" * @param subtree Fqn naming the root (i.e. highest level parent) node " +"of\n" +" * the subtree for which state is requested.\n" +" * \n" +" * @see org.jboss.cache.TreeCache#activateRegion(String)\n" +" */\n" +" byte[] loadState(Fqn subtree) throws Exception;\n" +" \n" +" /**\n" +" * Store the given portion of the cache tree's state in secondary " +"storage. \n" +" * Overwrite whatever is currently in secondary storage. If the " +"transferred \n" +" * state has Fqns equal to or children of parameter <code>subtree</" +"code>, \n" +" * then no special behavior is required. Otherwise, ensure that\n" +" * the state is integrated under the given 'subtree'. Typically\n" +" * in the latter case 'subtree' would be the Fqn of the buddy \n" +" * backup region for a buddy group; e.g.\n" +" * \n" +" * If the the transferred state had Fqns starting with \"/a\" and\n" +" * 'subtree' was \"/_BUDDY_BACKUP_/192.168.1.2:5555\" then the\n" +" * state should be stored in the local persistent store under\n" +" * \"/_BUDDY_BACKUP_/192.168.1.2:5555/a\"\n" +" * \n" +" * @param state the state to store\n" +" * @param subtree Fqn naming the root (i.e. highest level parent) node " +"of\n" +" * the subtree included in 'state'. If the Fqns \n" +" * of the data included in 'state' are not \n" +" * already children of 'subtree', then their\n" +" * Fqns should be altered to make them children of \n" +" * 'subtree' before they are persisted.\n" +" */ \n" +" void storeState(byte[] state, Fqn subtree) throws Exception;\n" +" \n" +" /**\n" +" * Sets the {@link RegionManager} this object should use to manage \n" +" * marshalling/unmarshalling of different regions using different\n" +" * classloaders.\n" +" *\n" +" * NOTE: This method is only intended to be used by the TreeCache " +"instance \n" +" * this cache loader is associated with.\n" +" * \n" +" * @param manager the region manager to use, or <code>null</code>.\n" +" */\n" +" void setRegionManager(RegionManager manager);\n" +"\n" +"}" #. Tag: para #: Cache_loaders.xml:33 @@ -372,7 +606,7 @@ #: Cache_loaders.xml:40 #, no-c-format msgid "The CacheLoader Interface" -msgstr "" +msgstr "Das CacheLoader-Interface" #. Tag: para #: Cache_loaders.xml:41 @@ -399,6 +633,15 @@ " void destroy();\n" "}" msgstr "" +"public interface Service {\n" +" void create() throws Exception;\n" +"\n" +" void start() throws Exception;\n" +"\n" +" void stop();\n" +"\n" +" void destroy();\n" +"}" #. Tag: para #: Cache_loaders.xml:45 @@ -501,13 +744,13 @@ #: Cache_loaders.xml:72 #, no-c-format msgid "Configuration via XML" -msgstr "" +msgstr "Konfiguration via XML" #. Tag: para #: Cache_loaders.xml:73 #, no-c-format msgid "The CacheLoader is configured as follows in the JBossCache XML file:" -msgstr "" +msgstr "Der CacheLoader wird wie folgt in der JBossCache XML-Datei konfiguriert:" #. Tag: programlisting #: Cache_loaders.xml:76 @@ -577,6 +820,69 @@ "\n" " </mbean>" msgstr "" +"\n" +" \n" +" \n" +"\n" +" <mbean code=\"org.jboss.cache.TreeCache\" name=\"jboss.cache:" +"service=TreeCache\">\n" +"\n" +" \n" +" <attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" \n" +" <passivation>false</passivation>\n" +" \n" +" <preload>/</preload>\n" +" \n" +" <shared>false</shared>\n" +"\n" +" \n" +" \n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.JDBCCacheLoader</" +"class>\n" +" \n" +" <async>false</async>\n" +" \n" +" <fetchPersistentState>true</" +"fetchPersistentState>\n" +" \n" +" <ignoreModifications>false</" +"ignoreModifications>\n" +" \n" +" <purgeOnStartup>false</purgeOnStartup>\n" +" </cacheloader>\n" +"\n" +" </config>\n" +" </attribute>\n" +"\n" +" </mbean>" #. Tag: para #: Cache_loaders.xml:77 @@ -621,6 +927,33 @@ "attribute>\n" " </mbean>" msgstr "" +"\n" +" \n" +" \n" +"\n" +" <mbean code=\"org.jboss.cache.TreeCache\" name=\"jboss.cache:" +"service=TreeCache\">\n" +" <attribute name=\"CacheLoaderClass\">org.jboss.cache.loader." +"bdbje.BdbjeCacheLoader\n" +" </attribute>\n" +" \n" +" <attribute name=\"CacheLoaderConfig\" replace=\"false\">\n" +" location=c:\\tmp\\bdbje\n" +" </attribute>\n" +" <attribute name=\"CacheLoaderShared\">true</attribute>\n" +" <attribute name=\"CacheLoaderPreload\">/</attribute>\n" +" <attribute name=\"CacheLoaderFetchTransientState\">false</" +"attribute>\n" +" <attribute name=\"CacheLoaderFetchPersistentState\">true</" +"attribute>\n" +" <attribute name=\"CacheLoaderAsynchronous\">true</" +"attribute>\n" +" </mbean>" #. Tag: para #: Cache_loaders.xml:83 @@ -636,7 +969,7 @@ #: Cache_loaders.xml:86 #, no-c-format msgid "The currently available implementations shipped with JBossCache are:" -msgstr "" +msgstr "Die derzeit mit JBossCache distribuierten Implementierungen sind:" #. Tag: para #: Cache_loaders.xml:91 @@ -823,7 +1156,7 @@ #: Cache_loaders.xml:151 #, no-c-format msgid "Cache passivation" -msgstr "" +msgstr "Cache-Passivierung" #. Tag: para #: Cache_loaders.xml:152 @@ -875,13 +1208,13 @@ #: Cache_loaders.xml:167 #, no-c-format msgid "CacheLoader use cases" -msgstr "" +msgstr "CacheLoader Anwendungsfälle" #. Tag: title #: Cache_loaders.xml:169 #, no-c-format msgid "Local cache with store" -msgstr "" +msgstr "Lokales Cache mit Speicher" #. Tag: para #: Cache_loaders.xml:170 @@ -914,8 +1247,7 @@ #. Tag: para #: Cache_loaders.xml:180 #, no-c-format -msgid "" -"The following figure shows 2 JBossCache nodes sharing the same backend store:" +msgid "The following figure shows 2 JBossCache nodes sharing the same backend store:" msgstr "" #. Tag: title @@ -1074,7 +1406,7 @@ #: Cache_loaders.xml:271 #, no-c-format msgid "Hierarchical caches" -msgstr "" +msgstr "Hierarchische Caches" #. Tag: para #: Cache_loaders.xml:272 @@ -1111,6 +1443,26 @@ "// start firstLevel\n" "firstLevel.startService();" msgstr "" +"TreeCache firstLevel, secondLevel;\n" +"LocalDelegatingCacheLoader cache_loader;\n" +"\n" +"// create and configure firstLevel\n" +"firstLevel=new TreeCache();\n" +"\n" +"// create and configure secondLevel\n" +"secondLevel=new TreeCache();\n" +"\n" +"// create DelegatingCacheLoader\n" +"cache_loader=new LocalDelegatingCacheLoader(secondLevel);\n" +"\n" +"// set CacheLoader in firstLevel\n" +"firstLevel.setCacheLoader(cache_loader);\n" +"\n" +"// start secondLevel\n" +"secondLevel.startService();\n" +"\n" +"// start firstLevel\n" +"firstLevel.startService();" #. Tag: para #: Cache_loaders.xml:276 @@ -1170,6 +1522,45 @@ "...\n" "</mbean>" msgstr "" +"\n" +"\n" +"\n" +"\n" +"<mbean code=\"org.jboss.cache.TreeCache\" name=\"jboss.cache:" +"service=TreeCache\">\n" +"...\n" +"<attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" <passivation>false</passivation>\n" +" <preload>/some/stuff</preload>\n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.RpcDelegatingCacheLoader</" +"class>\n" +" \n" +" <async>false</async>\n" +" \n" +" <fetchPersistentState>false</fetchPersistentState>\n" +" \n" +" <ignoreModifications>false</ignoreModifications>\n" +" \n" +" <purgeOnStartup>false</purgeOnStartup>\n" +" </cacheloader>\n" +" </config>\n" +"</attribute>\n" +"...\n" +"</mbean>" #. Tag: para #: Cache_loaders.xml:280 @@ -1184,7 +1575,7 @@ #: Cache_loaders.xml:286 #, no-c-format msgid "TcpDelegatingCacheLoader" -msgstr "" +msgstr "TcpDelegatingCacheLoader" #. Tag: para #: Cache_loaders.xml:287 @@ -1218,8 +1609,7 @@ #. Tag: para #: Cache_loaders.xml:296 #, no-c-format -msgid "" -"An example set of a TcpCacheServer running inside of JBoss is shown below:" +msgid "An example set of a TcpCacheServer running inside of JBoss is shown below:" msgstr "" #. Tag: programlisting @@ -1245,6 +1635,24 @@ "\n" "</server>" msgstr "" +"<server>\n" +"\n" +" <classpath codebase=\"./lib\" archives=\"jboss-cache.jar\"/>\n" +"\n" +" <mbean code=\"org.jboss.cache.loader.tcp.TcpCacheServer\" \n" +" name=\"jboss.cache:service=TcpCacheServer\">\n" +" <depends optional-attribute-name=\"Cache\"\n" +" proxy-type=\"attribute\">jboss.cache:service=TreeCache</" +"depends>\n" +" <attribute name=\"BindAddress\">${jboss.bind.address:" +"localhost}</attribute>\n" +" <attribute name=\"Port\">7500</attribute>\n" +" <attribute name=\"MBeanServerName\"></attribute>\n" +" \n" +" </mbean>\n" +"\n" +"</server>" #. Tag: para #: Cache_loaders.xml:300 @@ -1270,7 +1678,7 @@ #: Cache_loaders.xml:306 Cache_loaders.xml:342 #, no-c-format msgid "The client side looks as follow:" -msgstr "" +msgstr "Die Client-Seite sieht wie folgt aus:" #. Tag: programlisting #: Cache_loaders.xml:309 @@ -1289,6 +1697,18 @@ " </config>\n" "</attribute>" msgstr "" +"<attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.tcp." +"TcpDelegatingCacheLoader</class>\n" +" <properties>\n" +" host=localhost\n" +" port=7500\n" +" </properties>\n" +" </cacheloader>\n" +" </config>\n" +"</attribute>" #. Tag: para #: Cache_loaders.xml:310 @@ -1329,7 +1749,7 @@ #: Cache_loaders.xml:322 #, no-c-format msgid "RmiDelegatingCacheLoader" -msgstr "" +msgstr "RmiDelegatingCacheLoader" #. Tag: para #: Cache_loaders.xml:323 @@ -1361,8 +1781,7 @@ #. Tag: para #: Cache_loaders.xml:332 #, no-c-format -msgid "" -"An example set of an RmiCacheServer running inside of JBoss is shown below:" +msgid "An example set of an RmiCacheServer running inside of JBoss is shown below:" msgstr "" #. Tag: programlisting @@ -1391,6 +1810,27 @@ "\n" "</server>" msgstr "" +"<server>\n" +"\n" +" <classpath codebase=\"./lib\" archives=\"jboss-cache.jar\"/>\n" +"\n" +" <mbean code=\"org.jboss.cache.loader.rmi.RmiCacheServer\" \n" +" name=\"jboss.cache:service=RmiCacheServer\">\n" +" <depends optional-attribute-name=\"Cache\"\n" +" proxy-type=\"attribute\">jboss.cache:service=TreeCache</" +"depends>\n" +" \n" +" <attribute name=\"BindAddress\">${jboss.bind.address:" +"localhost}</attribute>\n" +" <attribute name=\"Port\">1098</attribute>\n" +" <attribute name=\"BindName\">MyRmiCacheServer</" +"attribute>\n" +" <attribute name=\"MBeanServerName\"></attribute>\n" +" \n" +" </mbean>\n" +"\n" +"</server>" #. Tag: para #: Cache_loaders.xml:336 @@ -1431,6 +1871,19 @@ " </config>\n" "</attribute>" msgstr "" +"<attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.RmiDelegatingCacheLoader</" +"class>\n" +" <properties>\n" +" host=localhost\n" +" port=1098\n" +" name=MyRmiCacheServer\n" +" </properties>\n" +" </cacheloader>\n" +" </config>\n" +"</attribute>" #. Tag: para #: Cache_loaders.xml:346 @@ -1453,7 +1906,7 @@ #: Cache_loaders.xml:357 #, no-c-format msgid "JDBC-based CacheLoader" -msgstr "" +msgstr "JDBC-basierter CacheLoader" #. Tag: para #: Cache_loaders.xml:358 @@ -1476,13 +1929,13 @@ #: Cache_loaders.xml:364 #, no-c-format msgid "column for FQN (which is also a primary key column)" -msgstr "" +msgstr "Spalte für FQN (welches auch die primäre Schlüsselspalte ist)" #. Tag: para #: Cache_loaders.xml:367 #, no-c-format msgid "column for node contents (attribute/value pairs)" -msgstr "" +msgstr "Spalte für Node-Inhalte (Attribute/Wertepaare)" #. Tag: para #: Cache_loaders.xml:370 @@ -1518,13 +1971,13 @@ #: Cache_loaders.xml:381 #, no-c-format msgid "JDBCCacheLoader configuration" -msgstr "" +msgstr "JDBCCacheLoader-Konfiguration" #. Tag: title #: Cache_loaders.xml:383 #, no-c-format msgid "Table configuration" -msgstr "" +msgstr "Tabellenkonfiguration" #. Tag: para #: Cache_loaders.xml:384 @@ -1604,7 +2057,7 @@ #: Cache_loaders.xml:415 #, no-c-format msgid "DataSource" -msgstr "" +msgstr "DataSource" #. Tag: para #: Cache_loaders.xml:416 @@ -1626,7 +2079,7 @@ #: Cache_loaders.xml:426 #, no-c-format msgid "JDBC driver" -msgstr "" +msgstr "JDBC-Treiber" #. Tag: para #: Cache_loaders.xml:427 @@ -1639,8 +2092,7 @@ #. Tag: para #: Cache_loaders.xml:430 #, no-c-format -msgid "" -"<emphasis>cache.jdbc.driver</emphasis> - fully qualified JDBC driver name." +msgid "<emphasis>cache.jdbc.driver</emphasis> - fully qualified JDBC driver name." msgstr "" #. Tag: para @@ -1652,8 +2104,7 @@ #. Tag: para #: Cache_loaders.xml:436 #, no-c-format -msgid "" -"<emphasis>cache.jdbc.user</emphasis> - user name to connect to the database." +msgid "<emphasis>cache.jdbc.user</emphasis> - user name to connect to the database." msgstr "" #. Tag: para @@ -1668,7 +2119,7 @@ #: Cache_loaders.xml:446 #, no-c-format msgid "Configuration example" -msgstr "" +msgstr "Konfigurationsbeispiel" #. Tag: para #: Cache_loaders.xml:447 @@ -1726,6 +2177,48 @@ " </config>\n" "</attribute>" msgstr "" +"<attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" <passivation>false</passivation>\n" +" <preload>/some/stuff</preload>\n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.JDBCCacheLoader</" +"class>\n" +" \n" +" <properties>\n" +" cache.jdbc.table.name=jbosscache\n" +" cache.jdbc.table.create=true\n" +" cache.jdbc.table.drop=true\n" +" cache.jdbc.table.primarykey=jbosscache_pk\n" +" cache.jdbc.fqn.column=fqn\n" +" cache.jdbc.fqn.type=varchar(255)\n" +" cache.jdbc.node.column=node\n" +" cache.jdbc.node.type=blob\n" +" cache.jdbc.parent.column=parent\n" +" cache.jdbc.driver=oracle.jdbc.OracleDriver\n" +" cache.jdbc.url=jdbc:oracle:thin:@localhost:1521:JBOSSDB\n" +" cache.jdbc.user=SCOTT\n" +" cache.jdbc.password=TIGER\n" +" </properties>\n" +" \n" +" <async>false</async>\n" +" \n" +" <fetchPersistentState>true</fetchPersistentState>\n" +" \n" +" <ignoreModifications>false</ignoreModifications>\n" +" \n" +" <purgeOnStartup>false</purgeOnStartup>\n" +" </cacheloader>\n" +" </config>\n" +"</attribute>" #. Tag: para #: Cache_loaders.xml:453 @@ -1770,3 +2263,34 @@ " </config>\n" "</attribute>" msgstr "" +"<attribute name=\"CacheLoaderConfiguration\">\n" +" <config>\n" +" <passivation>false</passivation>\n" +" <preload>/some/stuff</preload>\n" +" <cacheloader>\n" +" <class>org.jboss.cache.loader.JDBCCacheLoader</" +"class>\n" +" \n" +" <properties>\n" +" cache.jdbc.datasource=java:/DefaultDS\n" +" </properties>\n" +" \n" +" <async>false</async>\n" +" \n" +" <fetchPersistentState>true</fetchPersistentState>\n" +" \n" +" <ignoreModifications>false</ignoreModifications>\n" +" \n" +" <purgeOnStartup>false</purgeOnStartup>\n" +" </cacheloader>\n" +" </config>\n" +"</attribute>" +

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits April 2009